diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index 58f4bcc..8080fbd 100644
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -15,7 +15,13 @@
     <link rel="alternate" href="{{ '/feed/feed.xml' | url }}" type="application/atom+xml" title="{{ metadata.title }}">
     <link rel="alternate" href="{{ '/feed/feed.json' | url }}" type="application/json" title="{{ metadata.title }}">
 
-    {# TODO add link rel="alternate" for langs #}
+    {%- set alternateUrls = page.url | locale_links %}
+    {% if alternateUrls.length %}
+    <link rel="alternate" hreflang="{{ lang or metadata.language }}" href="{{ page.url | absoluteUrl(metadata.url) }}">
+    {%- for link in alternateUrls %}
+    <link rel="alternate" hreflang="{{ link.lang }}" href="{{ link.url | absoluteUrl(metadata.url) }}">
+    {%- endfor %}
+    {%- endif %}
   </head>
   <body>
     <header>
diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
index 34d0887..81c4f46 100644
--- a/_includes/layouts/post.njk
+++ b/_includes/layouts/post.njk
@@ -18,10 +18,11 @@ templateClass: tmpl-post
 {% if i18nLinks.length %}
 <ul>
   <li>
-    This page is also available in: <!-- don’t forget to localize this text too -->
-{%- for link in i18nLinks %}
-{%- if not loop.first %},{% endif %}<a href="{{link.url}}" lang="{{link.lang}}" hreflang="{{link.lang}}">{{link.label}}</a>
-{%- endfor -%}
+    This page is also available in:
+    {%- for link in i18nLinks %}
+    <a href="{{ link.url }}" lang="{{ link.lang }}" hreflang="{{ link.lang }}">{{ link.label }}</a>
+    {%- if not loop.last %},{% endif %}
+    {%- endfor -%}
   </li>
 </ul>
 {% endif %}
