diff --git a/.htaccess b/.htaccess
index e69de29..694d1e7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -0,0 +1,2 @@
+FallbackResource /index.php
+ErrorDocument 404 /index.php
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ef8ee0d..f21c25c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,6 @@ JQUERYVER=2.1.1
 FONTS=robotech-gp.ttf robotaur.ttf
 
 BOOTSTRAPNEEDED=js/bootstrap.min.js css/bootstrap.min.css fonts/glyphicons-halflings-regular.*
-
-REDIRS=$(shell cd pages; echo *.php)
 BOOTSTRAPNAME=bootstrap-$(BOOTSTRAPVER)-dist
 
 all: redirs $(BOOTSTRAPNEEDED) js/jquery.min.js	$(addprefix fonts/,$(FONTS))
@@ -38,4 +36,4 @@ fonts/robotaur.ttf:
 
 clean:
 	cd img; make clean
-	rm -rf $(REDIRS) $(BOOTSTRAPNEEDED) $(addprefix fonts/,$(FONTS)) js/jquery.min.js
+	rm -rf $(BOOTSTRAPNEEDED) $(addprefix fonts/,$(FONTS)) js/jquery.min.js
diff --git a/index.php b/index.php
index e3a3ddb..42b2a51 100755
--- a/index.php
+++ b/index.php
@@ -16,7 +16,12 @@ if ($page == '') {
 $toLoad = "pages/$page.php";
 
 if (!file_exists($toLoad)) {
+	header('HTTP/1.1 404 Not Found');
+	header('Status: 404 Not Found'); // FastCGI fix
 	$toLoad = '404.php';
+} else {
+	header('HTTP/1.1 200 OK');
+	header('Status: 200 OK'); // FastCGI fix
 }
 
 if (isset($_GET['c'])) {
--
libgit2 0.21.2