diff --git a/Changelog.md b/Changelog.md
index 966038fcb..fb3345747 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@
 * Make I18n system more robust against missing keys in pluralization data
 * Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487)
 * Disable submit button in sign up form after submission to avoid email already exists error [#4506](https://github.com/diaspora/diaspora/issues/4506)
+* Do not pull the 404 pages assets from Amazon S3 [#4501](https://github.com/diaspora/diaspora/pull/4501)
 
 ## Features
 * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
diff --git a/public/404.html b/public/404.html
index de39911e6..f2d8f6910 100644
--- a/public/404.html
+++ b/public/404.html
@@ -3,8 +3,8 @@
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
   <style type="text/css">
-    @font-face{font-family:Roboto;src:url(https://s3.amazonaws.com/joindiaspora/fonts/Roboto-Regular.ttf)}
-    @font-face{font-family:Roboto-BoldCondensed;src:url(https://s3.amazonaws.com/joindiaspora/fonts/Roboto-BoldCondensed.ttf)}
+    @font-face{font-family:Roboto;src:url("Roboto-Regular.ttf")}
+    @font-face{font-family:Roboto-BoldCondensed;src:url("Roboto-BoldCondensed.ttf")}
 
     body,
     html {
@@ -19,7 +19,7 @@
       color: #666;
       text-align: center;
       font-family: Roboto, Helvetica, Arial, sans-serif;
-      background-image: url(https://joindiaspora.s3.amazonaws.com/assets/pattern-4deadcd0b3ee298c791c9055bdef3377.png);
+      background-image: url("bgpattern.png");
       text-shadow: 0 1px 0 #fff;
     }
 
@@ -79,7 +79,7 @@
   </div>
 
   <div id="cat-footer" class="transparent">
-    <img src="https://s3.amazonaws.com/joindiaspora/peeping-tom.png">
+    <img src="peeping-tom.png">
   </div>
 </body>
 </html>
diff --git a/public/Roboto-BoldCondensed.ttf b/public/Roboto-BoldCondensed.ttf
new file mode 100644
index 000000000..d7ea8833b
Binary files /dev/null and b/public/Roboto-BoldCondensed.ttf differ
diff --git a/public/Roboto-Regular.ttf b/public/Roboto-Regular.ttf
new file mode 100644
index 000000000..7d9a6c4c3
Binary files /dev/null and b/public/Roboto-Regular.ttf differ
diff --git a/public/bgpattern.png b/public/bgpattern.png
new file mode 100644
index 000000000..a21195356
Binary files /dev/null and b/public/bgpattern.png differ
diff --git a/public/peeping-tom.png b/public/peeping-tom.png
new file mode 100644
index 000000000..e35c0a1f7
Binary files /dev/null and b/public/peeping-tom.png differ
