diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index bd4352b9e9..a3789e7573 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -774,7 +774,6 @@ Build:38.0,380000
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
     scanignore=mobile/android/base/JavaAddonManager.java
     prebuild=mkdir fdroid && \
-        vercode=380000 && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
@@ -792,7 +791,7 @@ Build:38.0,380000
         echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
         echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
         echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
-        echo "mk_add_options 'export ANDROID_VERSION_CODE=${vercode}'" >> .mozconfig && \
+        echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig && \
         echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .mozconfig && \
         pushd mobile/android/branding/unofficial/ && \
         sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
@@ -846,7 +845,6 @@ Build:38.0,380010
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
     scanignore=mobile/android/base/JavaAddonManager.java
     prebuild=mkdir fdroid && \
-        vercode=380010 && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
@@ -864,7 +862,7 @@ Build:38.0,380010
         echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
         echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
         echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
-        echo "mk_add_options 'export ANDROID_VERSION_CODE=${vercode}'" >> .mozconfig && \
+        echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig && \
         echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' <  mobile/android/locales/maemo-locales)'" >> .mozconfig && \
         pushd mobile/android/branding/unofficial/ && \
         sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \