diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt
index a19c121c51..06dde75f57 100644
--- a/metadata/net.nurik.roman.dashclock.txt
+++ b/metadata/net.nurik.roman.dashclock.txt
@@ -40,27 +40,14 @@ sed -i '59\,74d' res/values-es/strings.xml && \
 cd ../../../ && echo "source.dir=$PWD/main/src/main/java;$PWD/api/src/main/java;\
 $PWD/main/src/main/aidl;$PWD/api/src/main/aidl" >> main/src/main/ant.properties
 
-Build:1.6,26
+Build:1.6,30
     commit=v1.6
-    subdir=main/src/main
-    target=android-19
-    init=touch project.properties
-    forceversion=yes
-    forcevercode=yes
-    extlibs=android/android-support-v13.jar
-    srclibs=1:DragSort@0.6.1
-    patch=code_26.patch;disable_gplay.diff
-    prebuild=cd ../../../ && \
-        echo "source.dir=$PWD/main/src/main/java;$PWD/api/src/main/java;$PWD/main/src/main/aidl;$PWD/api/src/main/aidl" >> main/src/main/ant.properties
+    gradle=yes
+    patch=code_30.patch;disable_gplay.diff;basename.patch
+    prebuild=echo "sdk.dir=$ANDROID_HOME" > local.properties && ln -s main/build
 
-Maintainer Notes:
-No build system whatsoever. No versions, no target api level, no build.gradle/project.properties, etcetera.
-
-The lack of these makes for an unnecessarily large apk amongst other possible issues.
-.
-
-Auto Update Mode:None
+Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:1.6
-Current Version Code:26
+Current Version Code:30
 
diff --git a/metadata/net.nurik.roman.dashclock/basename.patch b/metadata/net.nurik.roman.dashclock/basename.patch
new file mode 100644
index 0000000000..a8e67cd592
--- /dev/null
+++ b/metadata/net.nurik.roman.dashclock/basename.patch
@@ -0,0 +1,13 @@
+diff --git a/main/build.gradle b/main/build.gradle
+index 14b8eb7..c7acb15 100644
+--- a/main/build.gradle
++++ b/main/build.gradle
+@@ -25,7 +25,7 @@ buildscript {
+ 
+ apply plugin: 'android'
+ 
+-project.archivesBaseName = "dashclock"
++project.archivesBaseName = "DashClock"
+ 
+ repositories {
+     mavenCentral()
diff --git a/metadata/net.nurik.roman.dashclock/code_26.patch b/metadata/net.nurik.roman.dashclock/code_30.patch
similarity index 100%
rename from metadata/net.nurik.roman.dashclock/code_26.patch
rename to metadata/net.nurik.roman.dashclock/code_30.patch
diff --git a/metadata/net.nurik.roman.dashclock/disable_gplay.diff b/metadata/net.nurik.roman.dashclock/disable_gplay.diff
index 788e8ab83b..9ebf953420 100644
--- a/metadata/net.nurik.roman.dashclock/disable_gplay.diff
+++ b/metadata/net.nurik.roman.dashclock/disable_gplay.diff
@@ -2,6 +2,8 @@ diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.x
 index 307e779..d635d22 100755
 diff --git a/main/src/main/java/com/google/android/apps/dashclock/weather/WeatherExtension.java b/main/src/main/java/com/google/android/apps/dashclock/weather/WeatherExtension.java
 index b9aec91..5119fa2 100644
+diff --git a/main/build.gradle b/main/build.gradle
+index 14b8eb7..e04e756 100644
 --- a/main/src/main/AndroidManifest.xml
 +++ b/main/src/main/AndroidManifest.xml
 @@ -283,9 +283,6 @@
@@ -174,3 +176,14 @@ index b9aec91..5119fa2 100644
          disableOneTimeLocationListener();
      }
  
+--- a/main/build.gradle
++++ b/main/build.gradle
+@@ -36,8 +36,6 @@ repositories {
+ 
+ dependencies {
+     compile 'com.android.support:support-v13:18.0.0'
+-    compile 'com.google.android.gms:play-services:4.0.30'
+-    //compile 'com.mobeta.android.dslv:drag-sort-listview:0.6.1-SNAPSHOT-AAR'
+     compile 'com.mobeta.android.dslv:drag-sort-listview:0.6.1-SNAPSHOT-AAR@aar'
+     compile project(':api')
+ }