diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py
index 73570872fababd80ef0c3e9d5c1e4bf2a9090bb4..a20d272f5ecbbe4e403f54224e1d4d5f0d2daa4b 100644
--- a/i2p2www/__init__.py
+++ b/i2p2www/__init__.py
@@ -43,42 +43,46 @@ SUPPORTED_LANGS = [
     'ru',
     'zh',
     'ar',
-    'fi',
-    'he',
+    'in',
+    'iw',
     'it',
     'ja',
     'ko',
     'mg',
     'nl',
+    'fa',
     'pl',
     'pt',
     'pt_BR',
     'ro',
+    'fi',
     'sv',
     'uk',
     ]
 
 SUPPORTED_LANG_NAMES = {
-    'ar': u'العربية',
+    'ar': u'Arabic العربية',
+    'in': u'Bahasa Indonesia',
+    'zh': u'Chinese 中文',
     'de': u'Deutsch',
     'en': u'English',
     'es': u'Castellano',
-    'fi': u'Suomi',
     'fr': u'Français',
-    'he': u'עברית',
+    'iw': u'Hebrew עברית',
     'it': u'Italiano',
-    'ja': u'日本語',
-    'ko': u'한국어',
+    'ja': u'Japanese 日本語',
+    'ko': u'Korean 한국말',
     'mg': u'Fiteny Malagasy',
     'nl': u'Nederlands',
+    'fa': u'Persian فارسی',
     'pl': u'Polski',
     'pt': u'Português',
     'pt_BR': u'Português do Brasil',
-    'ro': u'Român',
-    'ru': u'Русский язык',
+    'ro': u'Română',
+    'ru': u'Russian Русский язык',
+    'fi': u'Suomi',
     'sv': u'Svenska',
-    'uk': u'Українська',
-    'zh': u'中文',
+    'uk': u'Ukrainian Українська',
     }
 
 RTL_LANGS = [
diff --git a/i2p2www/static/images/flags/fa.png b/i2p2www/static/images/flags/fa.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5fd136aee534ecb59914e336cad18d18ead2a4a
Binary files /dev/null and b/i2p2www/static/images/flags/fa.png differ
diff --git a/i2p2www/static/images/flags/in.png b/i2p2www/static/images/flags/in.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6bc0fafac79403c97c64ba0228d35f250d05b57
Binary files /dev/null and b/i2p2www/static/images/flags/in.png differ
diff --git a/i2p2www/static/images/flags/iw.png b/i2p2www/static/images/flags/iw.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ca772d0b79b255872cde2fb29060bbbbad950f2
Binary files /dev/null and b/i2p2www/static/images/flags/iw.png differ