diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eb6080f98592041d70f091691c06c85d24db02b5..c2308b55bdb105b78e4d8fec99f2ec0f7e952f77 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,7 @@ Changelog
 
 0.4.7 (TBA)
 -----------
+* #87, #98: Add favicon (@lb1a)
 * #35, #95: Add default robots.txt file (@lb1a)
 * Bug #90: htdigest file handling broken in contrib.wsgi. (Philip Dexter)
 
diff --git a/LICENSE b/LICENSE
index 3b1cd651988cc7c1b1245337d50a706c11aef9d4..55dc30d3941a05e5144d6d65bd6d80e202d7dc8f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,9 @@
 https://github.com/jonashaag/klaus
 Copyright (c) 2011-2013 Jonas Haag <jonas@lophus.org> and contributors (see Git logs).
 
+Favicon: Git Logo by Jason Long <http://twitter.com/jasonlong>,
+         licensed under the Creative Commons Attribution 3.0 Unported License.
+
 Feature contributions
 ---------------------
 * Werkzeug port -- Martin Zimmermann <info@posativ.org>
diff --git a/klaus/static/favicon.png b/klaus/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..56587d1c16f3f23f5ff9d2f09c7a1e2e9509e158
Binary files /dev/null and b/klaus/static/favicon.png differ
diff --git a/klaus/templates/skeleton.html b/klaus/templates/skeleton.html
index c7c953dc1e7555117c4f147678f705a57b92cb92..896e3b6e66969d6d99d07dcf000961cd51730426 100644
--- a/klaus/templates/skeleton.html
+++ b/klaus/templates/skeleton.html
@@ -3,6 +3,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <link rel=stylesheet href={{ url_for('static', filename='pygments.css') }}>
 <link rel=stylesheet href={{ url_for('static', filename='klaus.css') }}>
+<link rel=icon type="image/png" href="{{ url_for('static', filename='favicon.png') }}" />
 
 <script src={{ url_for('static', filename='klaus.js') }}></script>