diff --git a/TODO b/TODO
index 5f890c2..f3e684c 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,6 @@ TODO:
  * Layout for maintainers (js collapse?)
  * Captcha
  * Show unpublished layers in a different style in the dependency list?
-* Favicon
 
 Later:
 * Provide a delete function for unpublished layers?
diff --git a/base.html b/base.html
index 70e0cdc..fb860bd 100644
--- a/base.html
+++ b/base.html
@@ -17,6 +17,7 @@
     <link rel="stylesheet" href="/static/css/bootstrap.css" />
     <link rel="stylesheet" href="/static/css/bootstrap-responsive.css" />
     <link rel="stylesheet" href="/static/css/additional.css" />
+    <link rel="icon" type="image/vnd.microsoft.icon" href="/static/img/favicon.ico" />
     <title>{% block title %}OpenEmbedded metadata index{% endblock %}</title>
 </head>
 
diff --git a/layerindex/static/img/favicon.ico b/layerindex/static/img/favicon.ico
new file mode 100644
index 0000000..66e7053
Binary files /dev/null and b/layerindex/static/img/favicon.ico differ
diff --git a/layerindex/urls.py b/layerindex/urls.py
index c1b06b4..1c62ae2 100644
--- a/layerindex/urls.py
+++ b/layerindex/urls.py
@@ -45,4 +45,5 @@ urlpatterns = patterns('',
             template_name='layerindex/rawrecipes.txt'),
             name='recipe_list_raw'),
     url(r'^about$', 'layerindex.views.about', name="about"),
+    url(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': 'layerindex/static/img/favicon.ico'}),
 )