diff --git a/xwords4/android/XWords4/app/build.gradle b/xwords4/android/XWords4/app/build.gradle
index be3fb36ea..4ca450d96 100644
--- a/xwords4/android/XWords4/app/build.gradle
+++ b/xwords4/android/XWords4/app/build.gradle
@@ -7,20 +7,6 @@ def LIBS_RELEASE = 'libs-release'
 
 apply plugin: 'com.android.application'
 
-def getVersionName = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--dirty'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim()
-    }
-    catch (ignored) {
-        return null;
-    }
-}
-
 dependencies {
     compile files('../libs/gcm.jar')
 }
@@ -34,6 +20,11 @@ android {
         targetSdkVersion 14
     }
 
+    // Rename all output artifacts to include version information
+    applicationVariants.all { variant ->
+        renameArtifact(variant)
+    }
+
     signingConfigs {
         release {
             storeFile file(System.getenv("HOME") + "/.keystore")
@@ -169,3 +160,26 @@ tasks.whenTaskAdded { theTask ->
         theTask.dependsOn "askForPassword"
     }
 }
+
+def getVersionName() {
+    try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'describe', '--dirty'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+    catch (ignored) {
+        return null;
+    }
+}
+
+def renameArtifact(variant) {
+    variant.outputs.each { output ->
+        def name = String.format( "XWords4-%s-%s.apk", variant.name,
+                                  getVersionName() )
+        output.outputFile = new File( (String)output.outputFile.parent, 
+                                      (String)name )
+    }
+}