diff --git a/config_editor.inc.php b/config_editor.inc.php
index a3a8ae5a..95098823 100644
--- a/config_editor.inc.php
+++ b/config_editor.inc.php
@@ -296,6 +296,14 @@ function config_editor($category, $year, $array_name, $self)
 			if($c > 5) print("</td></tr></table>");
 
 			break;
+		case 'language':
+			print("<select name=\"$name\">");
+			foreach($config['languages'] as $k=>$lang) {
+				$sel = ($config['default_language'] == $k) ? 'selected=selected' : '';
+				print("<option $sel value=\"$k\">$lang</option>");
+			}
+			print("</select>");
+			break;			
 
 		default:
 			print("<input size=\"$size\" type=\"text\" name=\"$name\" value=\"$val\">\n");
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index 9f54fe31..190a1803 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-122
+123
diff --git a/db/db.update.123.sql b/db/db.update.123.sql
new file mode 100644
index 00000000..8f042ef0
--- /dev/null
+++ b/db/db.update.123.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `config` CHANGE `type` `type` ENUM( '', 'yesno', 'number', 'text', 'enum', 'multisel', 'language' ) NOT NULL ;
+
+UPDATE config SET `type`='language' WHERE `var`='default_language';