diff --git a/assets/js/manual.js b/assets/js/manual.js
index 23e9da54..616c148b 100644
--- a/assets/js/manual.js
+++ b/assets/js/manual.js
@@ -53,6 +53,22 @@
         }).send();
     }
 
+    var populateLanguage = function() {
+        var markdownRequest = new Request({
+            "url": here + 'manual/' + locale + '/language.md',
+            "method": "get",
+            "onSuccess": function (response) {
+                var parser = new DOMParser(),
+                    list = parser.parseFromString(marked(response), 'text/xml');
+
+                $$(list.getElementsByTagName('li')).each(
+                    function(item) {
+                        $('language-items').grab(item);
+                    });
+            }
+        }).send();
+    }
+
     var populateVersion = function() {
         var versionRequest = new Request({
             "url": here + 'manual/' + locale + '/version.md',
@@ -89,10 +105,11 @@
             }
         })
         populateMenu();
+        populateLanguage();
         populateWindow(currentDoc);
         populateVersion();
 
-        document.id('language-item').addEvent('click:relay(a)', function (event, target) {
+        document.id('language-items').addEvent('click:relay(a)', function (event, target) {
             locale = target.get('href');
             populateMenu();
             populateWindow(currentDoc);
diff --git a/index.html b/index.html
index 3467e804..9f84e19d 100644
--- a/index.html
+++ b/index.html
@@ -41,9 +41,7 @@
                 <span id="language-select">English</span>
                 <b class="caret"></b>
               </a>
-              <ul id="language-item" class="dropdown-menu">
-                <li><a href="en-US">English</a></li>
-                <li><a href="zh-TW">中文 (繁體)</a></li>
+              <ul id="language-items" class="dropdown-menu">
               </ul>
             </li>
           </ul>
diff --git a/manual/en-US/language.md b/manual/en-US/language.md
new file mode 100644
index 00000000..1a96d5e3
--- /dev/null
+++ b/manual/en-US/language.md
@@ -0,0 +1,2 @@
+- [English](en-US)
+- [中文 (繁體)](zh-TW)
\ No newline at end of file
diff --git a/manual/language.md b/manual/language.md
new file mode 100644
index 00000000..1a96d5e3
--- /dev/null
+++ b/manual/language.md
@@ -0,0 +1,2 @@
+- [English](en-US)
+- [中文 (繁體)](zh-TW)
\ No newline at end of file