diff --git a/mediagoblin/static/images/goblin.ico b/mediagoblin/static/images/goblin.ico
new file mode 100644
index 00000000..f2e7152f
Binary files /dev/null and b/mediagoblin/static/images/goblin.ico differ
diff --git a/mediagoblin/static/images/goblin.png b/mediagoblin/static/images/goblin.png
new file mode 100644
index 00000000..0a3ad22e
Binary files /dev/null and b/mediagoblin/static/images/goblin.png differ
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 6e54c31d..91b434c1 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -28,6 +28,8 @@
           href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/>
     <link rel="stylesheet" type="text/css"
           href="{{ request.staticdirect('/css/base.css') }}"/>
+    <link rel="shortcut icon"
+          href="{{ request.staticdirect('/images/goblin.ico') }}" />
     {% block mediagoblin_head %}
     {% endblock mediagoblin_head %}
   </head>