diff --git a/lib/404.tpl b/lib/404.tpl
index 13bf79b..6378d76 100644
--- a/lib/404.tpl
+++ b/lib/404.tpl
@@ -1,7 +1,12 @@
-<!-- To have a custom 404 page copy this template to your site's (or masterSite) _inc director and edit it as you like -->
+<h1>The requested document at '<i>%($base_url$"req_path%)</i>' doesn't exist</h1>
 
-<h1>The page requested for <i>
-% echo ''''$"req_path''''
-</i> doesn't exist</h1>
+% # Google Enhanced 404 pages: http://www.google.com/support/webmasters/bin/answer.py?answer=93644
+<script type="text/javascript">
+  var GOOG_FIXURL_LANG = 'en';
+  var GOOG_FIXURL_SITE = '%($base_url%)/';
+</script>
+<script type="text/javascript" 
+    src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
 
-% # TODO: Use http://www.google.com/support/webmasters/bin/answer.py?answer=100044&hl=en by default?
+<h4>Or take a look at the <a href="/sitemap">sitemap</a>.</h4>
+<hr />