diff --git a/index.php b/index.php
index 3db8170ef4..d3b687c555 100644
--- a/index.php
+++ b/index.php
@@ -207,7 +207,10 @@ if(strlen($a->module)) {
 
 		logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-		notice( t('Page not found.' ) . EOL);
+		$tpl = get_markup_template("404.tpl");
+		$a->page['content'] = replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
 	}
 }
 
diff --git a/mod/help.php b/mod/help.php
index 59e062f6d4..af05bd47c0 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -36,8 +36,10 @@ function help_content(&$a) {
 	
 	if(! strlen($text)) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-		notice( t('Page not found.' ) . EOL);
-		return;
+		$tpl = get_markup_template("404.tpl");
+		return replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
 	}
 	
 	return Markdown($text);
diff --git a/view/404.tpl b/view/404.tpl
new file mode 100644
index 0000000000..bf4d4e949c
--- /dev/null
+++ b/view/404.tpl
@@ -0,0 +1 @@
+<h1>$message</h1>