diff --git a/CHANGELOG b/CHANGELOG
index ab32913a8..126aac1af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+mkdocs-material-0.x.x (2016-xx-xx)
+
+  * Set download link to latest version if available
+
 mkdocs-material-0.1.1 (2016-02-11)
 
   * Fixed #1: GitHub stars don't work if the repo_url ends with a '/'
diff --git a/material/drawer.html b/material/drawer.html
index a8735e1be..35a684720 100644
--- a/material/drawer.html
+++ b/material/drawer.html
@@ -20,12 +20,13 @@
       {% if repo_name == 'GitHub' %}
         <ul class="repo">
           <li class="repo-download">
-            <a href="https://github.com/{{ repo_id }}/archive/master.zip" target="_blank" aria-label="Download {{ repo_id }} on GitHub">
+            {% set version = config.extra.version | default('master') %}
+            <a href="{{ repo_url }}/archive/{{ version }}.zip" target="_blank" aria-label="Download {{ repo_id }} from GitHub">
               <i class="icon icon-download"></i> Download
             </a>
           </li>
           <li class="repo-stars">
-            <a href="https://github.com/{{ repo_id }}" target="_blank" aria-label="Star {{ repo_id }} on GitHub">
+            <a href="{{ repo_url }}" target="_blank" aria-label="Star {{ repo_id }} on GitHub">
               <i class="icon icon-star"></i> Star
               <span class="count">&ndash;</span>
             </a>
diff --git a/src/drawer.html b/src/drawer.html
index 65ce66859..e548b3109 100644
--- a/src/drawer.html
+++ b/src/drawer.html
@@ -35,13 +35,14 @@
       {% if repo_name == 'GitHub' %}
         <ul class="repo">
           <li class="repo-download">
-            <a href="https://github.com/{{ repo_id }}/archive/master.zip"
-              target="_blank" aria-label="Download {{ repo_id }} on GitHub">
+            {% set version = config.extra.version | default('master') %}
+            <a href="{{ repo_url }}/archive/{{ version }}.zip"
+              target="_blank" aria-label="Download {{ repo_id }} from GitHub">
               <i class="icon icon-download"></i> Download
             </a>
           </li>
           <li class="repo-stars">
-            <a href="https://github.com/{{ repo_id }}"
+            <a href="{{ repo_url }}"
               target="_blank" aria-label="Star {{ repo_id }} on GitHub">
               <i class="icon icon-star"></i> Star
               <span class="count">&ndash;</span>