diff --git a/_includes/2017/meta-vars.html b/_includes/2017/meta-vars.html
index a4b062f83..f5dba3a47 100644
--- a/_includes/2017/meta-vars.html
+++ b/_includes/2017/meta-vars.html
@@ -24,9 +24,13 @@ It emits some blank lines because Jekyll, lol.
 
 {% assign timestamp = site.time | date: "%Y%m%d%H%M%S" %}
 
-{% if site.data.assets.preview_host %}
-{% capture meta_image %}{{ site.data.assets.preview_host }}{{ include.page.url | remove: '.html' }}.jpg?t={{ timestamp }}{% endcapture %}
-{% endif %}
+{% if site.data.assets.preview_host %}{% capture meta_image %}{%
+  if page.type == 'home'
+%}{{ site.data.assets.preview_host }}/index.jpg?t={{ timestamp }}{%
+  else
+%}{{ site.data.assets.preview_host }}{{ include.page.url | remove: '.html' }}.jpg?t={{ timestamp }}{%
+  endif
+%}{% endcapture %}{% endif %}
 
 {% capture meta_title %}{% include values/title.html page=include.page %}{% endcapture %}
 {% assign meta_title = meta_title | strip_newlines %}
diff --git a/_includes/meta.html b/_includes/meta.html
index 200812590..c02ca5912 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -23,9 +23,9 @@
   <meta content="{{ meta_description | escape }}" property="twitter:description">
 {% endif %}
 
-{% if page.url != '/index.html' %}
-  <link rel="canonical" href="{{ site.url }}{{ page.url | remove: '.html' }}">
-  <meta name="og:url" content="{{ site.url }}{{ page.url | remove: '.html' }}">
+<link rel="canonical" href="{{ page_url }}">
+<meta name="og:url" content="{{ page_url }}">
+{% if page.type == 'home' %}
   <link rel="prefetch" href="{{ site.url }}">
   <link rel="prerender" href="{{ site.url }}">
 {% endif %}