diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index d174112..be371e9 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -18,8 +18,8 @@
   {% if page.keywords %}
     <meta name="keywords" content="{{page.keywords}}"/>
   {% endif %}
-
-  <link rel="canonical" href="{{ site.url }}{{ page.url }}"/>
+  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
+  <link rel="canonical" href="{{ canonical }}">
   <link href="{{ root_url }}/favicon.png" rel="shortcut icon" />
   <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
   <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>