diff --git a/calepin/templates/article.html b/calepin/templates/article.html
index c2f2cf2f1..abdaa1a0b 100644
--- a/calepin/templates/article.html
+++ b/calepin/templates/article.html
@@ -2,6 +2,12 @@
 
 {% block title %}{{ article.title }} - {{ super() }}{%endblock%}
 
+{% block head -%}
+{% if article.canonical %}
+  <link rel="canonical" href="{{ article.canonical }}">
+{%- endif %}
+{% endblock %}
+
 {% block content %}  
 
   <article class="hentry">
diff --git a/calepin/templates/base.html b/calepin/templates/base.html
index 41d6fc371..fc7530603 100644
--- a/calepin/templates/base.html
+++ b/calepin/templates/base.html
@@ -17,6 +17,7 @@
   <link rel="stylesheet" href="{{ SITEURL }}/theme/skeleton.css">
   <link rel="stylesheet" href="{{ SITEURL }}/theme/styles.css">
   <link rel="stylesheet" href="{{ SITEURL }}/theme/pygment.css">
+  {%- block head %}{% endblock %}
   
   <script src="http://cachedcommons.org/cache/modernizr/1.5.0/javascripts/modernizr-min.js"></script>
 
diff --git a/calepin/templates/index.html b/calepin/templates/index.html
index 07a0a3aff..addfb9980 100644
--- a/calepin/templates/index.html
+++ b/calepin/templates/index.html
@@ -8,9 +8,9 @@
   {% for article in articles_page.object_list %}
     <li>
       <abbr class="published" title="{{ article.date.isoformat() }}">
-        <a href="{{ article.url }}">{{ article.locale_date }}</a>
+        <a href="{{ SITEURL }}/{{ article.url }}">{{ article.locale_date }}</a>
       </abbr>
-      <h2><a href="{{ article.url }}">{{ article.title }}</a></h2>
+      <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
     </li>
   {% endfor %}
   </ul>