diff --git a/_includes/workshop_calendar.html b/_includes/workshop_calendar.html
new file mode 100644
index 0000000..53a0eac
--- /dev/null
+++ b/_includes/workshop_calendar.html
@@ -0,0 +1 @@
+<a href="//calendar.google.com/calendar/render?action=TEMPLATE&text={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop&dates={{ page.startdate | replace: "-", "" }}/{{ page.enddate | replace: "-", "" | plus: 0}}&trp=false&sprop&sprop=name:&sf=true&output=xml&location={{ page.address }}&details={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop at {{ page.venue }}">Add to your Google Calendar.</a>
diff --git a/index.html b/index.html
index 090fd08..99721ef 100644
--- a/index.html
+++ b/index.html
@@ -120,7 +120,7 @@ and the administrator will contact you if we need any extra information.</h4>
 <p id="when">
   <strong>When:</strong>
   {{page.humandate}}.
-  <a href="//calendar.google.com/calendar/render?action=TEMPLATE&text={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop&dates={{ page.startdate | replace: "-", "" }}/{{ page.enddate | replace: "-", "" }}&trp=false&sprop&sprop=name:&sf=true&output=xml&location={{ page.address }}&details={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop at {{ page.venue }}">Add to your Google Calendar.</a>
+  {% include workshop_calendar.html %}
 </p>
 {% endif %}