diff --git a/.gitignore b/.gitignore
index 627f45b56d7..6a2fd19172d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .cldr-data/
 .demos/
 .htaccess
-.multipage-404
 .wattsi-output/
+404.html
 caniuse.json
 cldr.inc
 entities-dtd.url
diff --git a/README.md b/README.md
index 8f37996608b..47135160714 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Then running build.sh inside this directory will generate the spec, multipage ve
 The relevant output files will be placed in this directory. They are:
 
 - .htaccess
-- .multipage-404
+- 404.html
 - entities.json
 - fonts/*
 - images/*
diff --git a/build.sh b/build.sh
index 9148535a6ee..bd2a6fc0834 100755
--- a/build.sh
+++ b/build.sh
@@ -125,20 +125,6 @@ cat .wattsi-output/index-html | perl .post-process-index-generator.pl | perl .po
 ln -s ../images .wattsi-output/multipage-html/
 ln -s ../link-fixup.js .wattsi-output/multipage-html/
 ln -s ../entities.json .wattsi-output/multipage-html/
-echo "ErrorDocument 404 /multipage/404.html" > .wattsi-output/multipage-html/.htaccess
-echo "<files *.txt>" >> .wattsi-output/multipage-html/.htaccess
-echo " ForceType text/plain" >> .wattsi-output/multipage-html/.htaccess
-echo "</files>" >> .wattsi-output/multipage-html/.htaccess
-echo "<files *.js>" >> .wattsi-output/multipage-html/.htaccess
-echo " ForceType text/javascript" >> .wattsi-output/multipage-html/.htaccess
-echo "</files>" >> .wattsi-output/multipage-html/.htaccess
-echo "<files *.css>" >> .wattsi-output/multipage-html/.htaccess
-echo " ForceType text/css" >> .wattsi-output/multipage-html/.htaccess
-echo "</files>" >> .wattsi-output/multipage-html/.htaccess
-echo "<files *.html>" >> .wattsi-output/multipage-html/.htaccess
-echo " ForceType text/html" >> .wattsi-output/multipage-html/.htaccess
-echo "</files>" >> .wattsi-output/multipage-html/.htaccess
-cp .multipage-404 .wattsi-output/multipage-html/404.html
 
 rm --recursive --force multipage
 mv .wattsi-output/multipage-html multipage