diff --git a/trunk/locale/languages.xml b/trunk/locale/languages.xml
index 8b92d49..d650333 100644
--- a/trunk/locale/languages.xml
+++ b/trunk/locale/languages.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language_codes PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<language_codes>
-  <lang>
-    <short/>
-    <name lang="en"/>
-    <name lang=""/>
-  </lang>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<languages>
   <lang>
     <short>aa</short>
     <name lang="en">Afar</name>
@@ -328,7 +323,7 @@
   </lang>
   <lang>
     <short>ia</short>
-    <name lang="en">Interlingua (International Auxiliary Language Association)</name>
+    <name lang="en">Interlingua</name>
     <name lang="ia">interlingua</name>
   </lang>
   <lang>
@@ -936,4 +931,5 @@
     <name lang="en">Zulu</name>
     <name lang="zu">isiZulu</name>
   </lang>
-</language_codes>
+</languages>
+</xsl:stylesheet>
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index eacae0f..9008b36 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -47,6 +47,8 @@
 <xsl:variable name="site_strings" select="document('../site/main.xml')//strings/string" />
 <xsl:variable name="locale_strings" select="document(concat('../locale/', $locale, '.xml'))//strings/string" />
 
+<xsl:variable name="language_strings" select="document('../locale/languages.xml')//languages/lang" />
+
 <!--
 this kills 99% of the processed XML
 we have to do this because XHTML + CSS presentation is dependant on the order of XHTML elements
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index f7e7992..5303eb4 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -274,23 +274,23 @@
                         <xsl:value-of select="$locale_strings[@id='instruction_language']" />
                         <br />
 
-                        <select name="DC.Language" size="2">
-                            <option>
-                                <xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_en-us']">
-                                    <xsl:attribute name="selected">
-                                        selected
+                        <select name="DC.Language" size="1">
+                            <xsl:for-each select="$language_strings">
+                                <option>
+                                    <xsl:variable name="short" select="short" />
+                                    <xsl:if test="//uploadform/@DC.Language=short">
+                                        <!-- never executed, plz fix -->
+                                        <xsl:attribute name="selected">
+                                            selected
+                                        </xsl:attribute>
+                                    </xsl:if>
+                                    <xsl:attribute name="value">
+                                        <xsl:value-of select="$short" />
                                     </xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="$locale_strings[@id='language_en-us']" />
-                            </option>
-                            <option>
-                                <xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_de-de']">
-                                    <xsl:attribute name="selected">
-                                        selected
-                                    </xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="$locale_strings[@id='language_de-de']" />
-                            </option>
+                                    <xsl:value-of select="name[@lang='en']" /><!-- language hardcoded to en - plz fix this -->
+                                    (<xsl:value-of select="name[@lang=$short]" />)
+                                </option>
+                            </xsl:for-each>
                         </select>
                         <br />