diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index e0c2d039..ae3fbe58 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -3,9 +3,6 @@ ac_add_options --with-app-name=${binName}
 ac_add_options --with-app-basename=Zen
 ac_add_options --enable-official-branding
 
-# Multi-locale
-ac_add_options --with-l10n-base="$PWD/../l10n"
-
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
diff --git a/l10n b/l10n
index 01202070..dd454155 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 012020707c2c3e9685f40a109f4b7bc19e8804e7
+Subproject commit dd454155fd0e6b5ee760259661518dac1654e00a
diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
index d4da0fec..9c6eeeb1 100644
--- a/scripts/download-language-packs.sh
+++ b/scripts/download-language-packs.sh
@@ -18,7 +18,7 @@ cd $CURRENT_DIR
 
 update_language() {
   langId=$1
-  cd l10n
+  cd ./l10n
   cd $langId
 
   echo "Updating $langId"
@@ -38,7 +38,30 @@ for lang in $(cat ./l10n/supported-languages); do
 done
 cd $CURRENT_DIR
 
+# Move all the files to the correct location
+browser_locales=engine/browser/locales
+copy_browser_locales() {
+  langId=$1
+  only_en=$2
+  mkdir -p $browser_locales/$langId
+  if [ "$only_en" = true ]; then
+    rsync -av --exclude=.git ./l10n/en-US/browser/ $browser_locales/$langId/
+    return
+  fi
+  rm -rf $browser_locales/$langId/
+  rsync -av --exclude=.git ./l10n/$langId/ $browser_locales/$langId/
+}
+
+copy_browser_locales en-US true
+for lang in $(cat ./l10n/supported-languages); do
+  copy_browser_locales $lang false
+done
 
 echo "Cleaning up"
 rm -rf ~/tools
 rm -rf ~/.git-cinnabar
+
+for lang in $(cat ./l10n/supported-languages); do
+  # remove every file except if it starts with "zen"
+  find ./l10n/$lang -type f -not -name "zen*" -delete
+done