diff --git a/.gitignore b/.gitignore
index facd25ca..a9d1f4e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 gps/
 Clover/app/keys.properties
+Clover/app/version.properties
 
 # Built application files
 *.apk
diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle
index 88a799fa..71755db4 100644
--- a/Clover/app/build.gradle
+++ b/Clover/app/build.gradle
@@ -4,16 +4,26 @@ android {
     compileSdkVersion 19
     buildToolsVersion "19.0.2"
 
+    Properties versionProps = new Properties()
+    versionProps.load(new FileInputStream(file('version.properties')))
+
+    /* in app/version.properties:
+    code=10
+    name=v1.0
+    */
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 19
+
+        versionName versionProps['name']
+        versionCode versionProps['code'].toInteger()
     }
 
     Properties props = new Properties()
     props.load(new FileInputStream(file('keys.properties')))
 
     /* in app/keys.properties:
-
     keystoreFile=key.keystore
     keystorePass=pass
     keyAlias=alias
@@ -31,15 +41,22 @@ android {
 
     buildTypes {
         release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-
             signingConfig signingConfigs.release
         }
 
+        beta.initWith(buildTypes.release)
+        beta {
+            versionNameSuffix " Beta"
+        }
+
         debug {
+            versionNameSuffix " Debug"
         }
     }
+
+    sourceSets {
+        beta.java.srcDirs = ['src/release/java']
+    }
 }
 
 dependencies {
diff --git a/Clover/app/src/main/AndroidManifest.xml b/Clover/app/src/main/AndroidManifest.xml
index 969669b1..43c073e7 100644
--- a/Clover/app/src/main/AndroidManifest.xml
+++ b/Clover/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.floens.chan"
     android:installLocation="auto"
-    android:versionCode="21"
-    android:versionName="v1.0.2" >
+    android:versionCode="0"
+    android:versionName="0" >
 
     <uses-sdk
         android:minSdkVersion="14"