diff --git a/android-mobile/AndroidManifest.xml b/android-mobile/AndroidManifest.xml
index e597a6ccd..8fa0c5e83 100644
--- a/android-mobile/AndroidManifest.xml
+++ b/android-mobile/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.subsurfacedivelog.mobile"
     android:installLocation="auto"
-    android:versionCode="1"
+    android:versionCode=@BUILD_NR@
     android:versionName=@SUBSURFACE_MOBILE_VERSION@ >
 
     <application
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 7b522b5df..3ca68eb2d 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -18,6 +18,12 @@ if [ "$1" = "debug" ] || [ "$1" = "Debug" ] ; then
 	shift
 fi
 
+if [ "$1" = "-buildnr" ] ; then
+	shift
+	BUILD_NR="\"$1\""
+	shift
+fi
+
 # Configure where we can find things here
 export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e
 
@@ -352,7 +358,7 @@ sed -i -e "s/-lcrypto//g" CMakeFiles/subsurface-mobile.dir/link.txt
 SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk "{ print \$3 }" )
 rm -rf android-mobile
 cp -a $SUBSURFACE_SOURCE/android-mobile .
-sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/$SUBSURFACE_MOBILE_VERSION/" android-mobile/AndroidManifest.xml
+sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/$SUBSURFACE_MOBILE_VERSION/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml
 
 # now build Subsurface and use the rest of the command line arguments
 make $@