diff --git a/bootstrap.conf b/bootstrap.conf
index e894666fd..79d4248c8 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -63,8 +63,6 @@ checkout_only_file=
 copy=true
 vc_ignore=
 
-SKIP_PO=n
-
 # Build prerequisites
 buildreq="\
 autoconf   2.64
@@ -109,9 +107,23 @@ bootstrap_post_import_hook () {
 bootstrap_epilogue () {
   mv INSTALL.grub INSTALL
 
-  # Update translation files and create LINGUAS file used to determine
-  # the set of languages used to translate.
-  if [ "x$SKIP_PO" = "xn" ]; then
-    ./linguas.sh
+  if [ "x$SKIP_PO" = "x" ]; then
+    # Generate LINGUAS with all supported languages. Bootstrap will
+    # generate a LINGUAS, but it will not contain the autogenerated
+    # languages.
+    autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH"
+
+    for x in $autogenerated; do
+      rm -f "po/$x.po";
+    done
+
+    (
+      (
+        cd po && ls *.po| cut -d. -f1
+        for x in $autogenerated; do
+            echo "$x";
+        done
+      ) | sort | uniq | xargs
+    ) >po/LINGUAS
   fi
 }