diff --git a/mediagoblin/static/images/404.png b/mediagoblin/static/images/404.png
new file mode 100644
index 00000000..78d746ba
Binary files /dev/null and b/mediagoblin/static/images/404.png differ
diff --git a/mediagoblin/templates/mediagoblin/404.html b/mediagoblin/templates/mediagoblin/404.html
new file mode 100644
index 00000000..7a86a386
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/404.html
@@ -0,0 +1,29 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% block mediagoblin_content %}
+  <h1>{% trans %}Oops!{% endtrans %}</h1>
+<div class="grid_8 alpha">
+  <p>There doesn't seem to be a page at this address. Sorry!</p>
+  <p>If you're sure the address is correct, maybe the page you're looking for has been moved or deleted.</p>
+</div>
+<div class="grid_8 omega">
+  <img src="{{ request.staticdirect('/images/404.png') }}" />
+</div>
+{% endblock %}