diff --git a/CHANGELOG b/CHANGELOG
index 95881f06a..96b88ea08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+mkdocs-material-0.x.x (2016-xx-xx)
+
+  * Fixed #16: Favicon could not be set through mkdocs.yml
+
 mkdocs-material-0.2.1 (2016-03-12)
 
   * Fixed #10: Invisible header after closing search bar with ESC key
diff --git a/material/base.html b/material/base.html
index 7897f1586..2e9b40e96 100644
--- a/material/base.html
+++ b/material/base.html
@@ -34,9 +34,9 @@
     {% if config.extra.logo %}
       <link rel="apple-touch-icon" href="{{ base_url }}/{{ config.extra.logo }}">
     {% endif %}
-    {% set icon = icon | default("assets/images/favicon-e565ddfa3b.ico") %}
-    <link rel="shortcut icon" type="image/x-icon" href="{{ base_url }}/{{ icon }}">
-    <link rel="icon" type="image/x-icon" href="{{ base_url }}/{{ icon }}">
+    {% set favicon = favicon | default("assets/images/favicon-e565ddfa3b.ico") %}
+    <link rel="shortcut icon" type="image/x-icon" href="{{ base_url }}/{{ favicon }}">
+    <link rel="icon" type="image/x-icon" href="{{ base_url }}/{{ favicon }}">
     <style>
       @font-face {
       	font-family: 'Icon';
diff --git a/src/base.html b/src/base.html
index ce705dcff..b05feba8c 100644
--- a/src/base.html
+++ b/src/base.html
@@ -58,11 +58,11 @@
     {% endif %}
 
     <!-- Favicon -->
-    {% set icon = icon | default("assets/images/favicon.ico") %}
+    {% set favicon = favicon | default("assets/images/favicon.ico") %}
     <link rel="shortcut icon" type="image/x-icon"
-      href="{{ base_url }}/{{ icon }}" />
+      href="{{ base_url }}/{{ favicon }}" />
     <link rel="icon" type="image/x-icon"
-      href="{{ base_url }}/{{ icon }}" />
+      href="{{ base_url }}/{{ favicon }}" />
 
     <!-- Configure icons (placed here to omit issues with subdirectories) -->
     <style>