Index: tools/configure
===================================================================
--- tools/configure	(revision 16114)
+++ tools/configure	(working copy)
@@ -1968,14 +1968,14 @@
 # Do not print "Entering directory ..."
 MAKEFLAGS += --no-print-directory
 
-.PHONY: all clean tags zip tools manual bin build info
+.PHONY: all clean tags zip tools manual bin build info langs
 
 all: info
 
 info: build
 	\$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
 
-build: tools
+build: tools langs
 	@SIMUL1@
 	@SIMUL2@
 	\$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
@@ -2001,7 +2001,7 @@
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
 	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
-	          voicefontids *.wav *.mp3 *.voice
+	          voicefontids *.wav *.mp3 *.voice max_language_size.h
 
 tools:
 	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
@@ -2045,6 +2045,12 @@
 gzip: tar
 	\$(SILENT)gzip -f9 rockbox.tar
 
+langs: features
+	\$(SILENT)mkdir -p \$(BUILDDIR)/apps/lang
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/apps/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+	for lang in \$(APPSDIR)/lang/*.lang; do langname=\`basename \$\$lang .lang\`; \$(TOOLSDIR)/genlang -e=\$(APPSDIR)/lang/english.lang -t=\$(ARCHOS)\$\$feat -i=\$(TARGET_ID) -b=\$(BUILDDIR)/apps/lang/\$\$langname.lng \$\$lang; done
+	\$(SILENT)echo "#define MAX_LANGUAGE_SIZE \`du -b apps/lang/* |sort -n |tail -n 1 |cut -f 1\`" > \$(BUILDDIR)/max_language_size.h
+
 manual: manual-pdf
 manual-pdf:
 	\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-pdf
Index: tools/buildzip.pl
===================================================================
--- tools/buildzip.pl	(revision 16114)
+++ tools/buildzip.pl	(working copy)
@@ -412,7 +412,8 @@
     #    `cp $webroot/docs/Help-Stu.txt .rockbox/docs/`;
     #}
 
-    buildlangs(".rockbox/langs");
+    #buildlangs(".rockbox/langs");
+    `cp apps/lang/*lng .rockbox/langs/`
 
 }