diff --git a/app/__init__.py b/app/__init__.py
index 5a1000db..17081770 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -34,8 +34,9 @@ app.config["FLATPAGES_MARKDOWN_EXTENSIONS"] = MARKDOWN_EXTENSIONS
 app.config["FLATPAGES_EXTENSION_CONFIG"] = MARKDOWN_EXTENSION_CONFIG
 app.config["BABEL_TRANSLATION_DIRECTORIES"] = "../translations"
 app.config["LANGUAGES"] = {
-    "en": "English",
-    "fr": "Français",
+	"en": "English",
+	"fr": "Français",
+	"ms": "Bahasa Melayu",
 }
 
 app.config.from_pyfile(os.environ["FLASK_CONFIG"])
diff --git a/app/templates/base.html b/app/templates/base.html
index b5a5b4f4..fbe107b4 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -173,22 +173,16 @@
 							<i class="fas fa-language"></i>
 						</a>
 							<ul class="dropdown-menu dropdown-menu-right" role="menu">
-								<li class="nav-item">
-									<form method="POST" action="{{ url_for('set_locale') }}">
-										<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-										<input type="hidden" name="locale" value="en" />
-										<input type="hidden" name="r" value="{{ url_set_query() }}" />
-										<input type="submit" class="btn btn-link nav-link" value="English (en)">
-									</form>
-								</li>
-								<li>
-									<form method="POST" action="{{ url_for('set_locale') }}">
-										<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-										<input type="hidden" name="locale" value="fr" />
-										<input type="hidden" name="r" value="{{ url_set_query() }}" />
-										<input type="submit" class="btn btn-link nav-link" value="Français (fr)">
-									</form>
-								</li>
+								{% for locale, locale_name in config["LANGUAGES"].items() %}
+									<li class="nav-item">
+										<form method="POST" action="{{ url_for('set_locale') }}">
+											<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+											<input type="hidden" name="locale" value="{{ locale }}" />
+											<input type="hidden" name="r" value="{{ url_set_query() }}" />
+											<input type="submit" class="btn btn-link nav-link" value="{{ locale_name }} ({{ locale }})">
+										</form>
+									</li>
+								{% endfor %}
 								<li class="dropdown-divider"></li>
 								<li class="nav-item ">
 									<a class="nav-link" href="https://hosted.weblate.org/projects/minetest/contentdb/">