diff --git a/_includes/head.html b/_includes/head.html
index 4b16114ae..b4ce6f0cd 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,5 +6,5 @@
{%- feed_meta -%}
- {% include hreflangs.html %}
+ {%- include hreflangs.html -%}
diff --git a/_includes/hreflangs.html b/_includes/hreflangs.html
index 6ee7a6153..1d746be21 100644
--- a/_includes/hreflangs.html
+++ b/_includes/hreflangs.html
@@ -1,33 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{% for translation in site.translations %}
+ {%- assign hreflang = translation.url | replace: '/index-', '' | replace: '.html', '' -%}
+
+{%- endfor -%}
+
diff --git a/_translations/index_gr.md b/_translations/index_el.md
similarity index 100%
rename from _translations/index_gr.md
rename to _translations/index_el.md
diff --git a/_translations/index_gal.md b/_translations/index_gl.md
similarity index 100%
rename from _translations/index_gal.md
rename to _translations/index_gl.md
diff --git a/_translations/index_jp.md b/_translations/index_ja.md
similarity index 100%
rename from _translations/index_jp.md
rename to _translations/index_ja.md
diff --git a/_translations/index_al.md b/_translations/index_sq.md
similarity index 100%
rename from _translations/index_al.md
rename to _translations/index_sq.md
diff --git a/_translations/index_rs.md b/_translations/index_sr.md
similarity index 100%
rename from _translations/index_rs.md
rename to _translations/index_sr.md
diff --git a/_translations/index_se.md b/_translations/index_sv.md
similarity index 100%
rename from _translations/index_se.md
rename to _translations/index_sv.md
diff --git a/_translations/index_ua.md b/_translations/index_uk.md
similarity index 100%
rename from _translations/index_ua.md
rename to _translations/index_uk.md
diff --git a/_translations/index_zh_cn.md b/_translations/index_zh_hans.md
similarity index 100%
rename from _translations/index_zh_cn.md
rename to _translations/index_zh_hans.md
diff --git a/_translations/index_zh_tw.md b/_translations/index_zh_hant.md
similarity index 97%
rename from _translations/index_zh_tw.md
rename to _translations/index_zh_hant.md
index dea21eac3..948cb1436 100644
--- a/_translations/index_zh_tw.md
+++ b/_translations/index_zh_hant.md
@@ -28,4 +28,4 @@ Richard M. Stallman，常被稱為RMS，幾十年來以來一直是自由軟體
您無權決定任何社區的領導人，尤其是以網路攻擊的方式。這種攻擊與 Richard Stallman 等更好的人所展示的公平辯論相差甚遠。
-請通過提交 [pull request](https://github.com/rms-support-letter/rms-support-letter.github.io/pulls) 來提交簽名。
+請通過提交 [pull request](https://github.com/rms-support-letter/rms-support-letter.github.io/pulls) 來提交簽名。