diff --git a/web/html/404.php b/web/html/404.php
new file mode 100644
index 00000000..06ad683a
--- /dev/null
+++ b/web/html/404.php
@@ -0,0 +1,14 @@
+<?php
+
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
+
+html_header( __("Page Not Found") );
+?>
+
+<div id="error-page" class="box 404">
+	<h2>404 - <?= __("Page Not Found") ?></h2>
+	<p><?= __("Sorry, the page you've requested does not exist.") ?></p>
+</div>
+
+<?php
+html_footer(AUR_VERSION);
diff --git a/web/html/index.php b/web/html/index.php
index 6ee23bc5..422c0e53 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -102,5 +102,9 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		header("Content-Type: image/png");
 		include "./$path";
 		break;
+	default:
+		header("HTTP/1.0 404 Not Found");
+		include "./404.php";
+		break;
 	}
 }