diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala
index 696cfe6e..d37716c4 100755
--- a/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -377,5 +377,10 @@ class Boot extends Loggable{
       case MyExceptionLogger(_, _, t) => throw t // this will never happen
     }
 
+
+
+    LiftRules.uriNotFound.prepend(NamedPF("404handler"){ case (req,failure) =>
+      NotFoundAsTemplate(ParsePath(List("404"),"html",true,false)) })
+
   }
 }
diff --git a/src/main/webapp/404.html b/src/main/webapp/404.html
new file mode 100644
index 00000000..fd14ef58
--- /dev/null
+++ b/src/main/webapp/404.html
@@ -0,0 +1,45 @@
+<!--
+Open Bank Project - Transparency / Social Finance Web Application
+Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see www.gnu.org/licenses/
+
+Email: contact@tesobe.com
+TESOBE / Music Pictures Ltd
+Osloerstrasse 16/17
+Berlin 13359, Germany
+
+-->
+
+
+
+
+
+<div id="main" class="lift:surround?with=default;at=content">
+    <div id="homeContent">
+        <h1>404 Not Found</h1>
+        <div id="404_text">
+            <p>
+                Sorry, we couldn't find the page you were looking for.
+            </p>
+
+            <p>
+                Maybe this is because you need permission - and you are not logged in?
+            </p>
+
+        </div>
+
+
+    </div>
+</div>