diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index d4f11e336..61d76ee0e 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -3,12 +3,13 @@ def VERSION_CODE_BASE = 114
 def VERSION_NAME = '4.4.118'
 def VARIANTS = [ "xw4", "xw4d" ]
 def BUILDS = [ "Debug", "Release" ]
+boolean forFDroid = hasProperty('forFDroid')
 
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
 def GITREV = "git describe --tags"
-if (! hasProperty('forFDroid')) {
+if (! forFDroid) {
     GITREV += " --dirty"
 }
 GITREV = GITREV.execute().text.trim()
@@ -47,6 +48,8 @@ android {
         variant.buildConfigField "String", "GCM_SENDER_ID", "\"$senderID\""
 
         variant.buildConfigField "short", "CLIENT_VERS_RELAY", "$INITIAL_CLIENT_VERS"
+
+        variant.buildConfigField "boolean", "FOR_FDROID", "$forFDroid"
     }
     
     flavorDimensions "variant"//, "abi"
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
index 73aa8c874..572c8178e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
@@ -124,8 +124,8 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
         }
 
         // App update
-        if ( Utils.isGooglePlayApp( context ) ) {
-            // Do nothing
+        if ( BuildConfig.FOR_FDROID || Utils.isGooglePlayApp( context ) ) {
+            // Do nothing; can't or mustn't upgrade app
         } else {
             String installer = pm.getInstallerPackageName( packageName );