diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index ff23b28..f4d5b3f 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -101,14 +101,21 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     // Include native name in output, if possible
     if (count($value) > 1) {
       $tname = t($value[0]);
-      $predefined[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
+      $language_list[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
     }
     else {
-      $predefined[$key] = t($value[0]);
+      $language_list[$key] = t($value[0]);
     }
   }
-  asort($predefined);
-  $form['basic']['language']['#options'] = $predefined;
+
+  // Get all languages
+  if(module_exists('locale')) {
+    $custom_language_list = locale_language_list('name');
+    $language_list = array_merge($language_list, $custom_language_list);
+  }
+
+  asort($language_list);
+  $form['basic']['language']['#options'] = $language_list;
 
   $form['buttons'] = array(
     '#type' => 'fieldset',