diff --git a/metadata/com.twofours.surespot.txt b/metadata/com.twofours.surespot.txt
index c993a9b813..5036c1453d 100644
--- a/metadata/com.twofours.surespot.txt
+++ b/metadata/com.twofours.surespot.txt
@@ -52,13 +52,11 @@ Build:61-fdroid,61
 Build:63-fdroid,63
     disable=needs cleaning
     commit=aa83369736b7533cb8ab824ee36be032b40271bf
-    patch=Ex.patch,Im.patch
+    patch=Ex-63.patch,Im-63.patch
     gradle=yes
+    srclibs=gcm@7f647288103bac2c5552af881f0e217c5b95d78a
+    rm=.google_apis/._.DS_Store,._.DS_Store,surespot/libs/*,surespot/src/main/res/raw/ffmpegpie,surespot/src/main/res/raw/ffmpeg,surespotcommon/libs/acra-4.5.0.jar
     prebuild=pwd && \
-        rm '._.DS_Store' && \
-        rm 'surespot/src/main/res/raw/ffmpegpie' && \
-        rm 'surespot/src/main/res/raw/ffmpeg' && \
-        rm 'surespotcommon/libs/acra-4.5.0.jar' && \
         touch 'surespot/src/main/res/raw/ffmpegpie' && \
         touch 'surespot/src/main/res/raw/ffmpeg' && \
         cp build.gradle build.gradle__BAK && \
@@ -97,14 +95,7 @@ Build:63-fdroid,63
         sed -i -e 's#compile files(.*libs.*)##' build.gradle && \
         rm surespot/src/main/java/com/twofours/surespot/backup/DriveHelper.java && \
         sed -i -e 's#android {#android {\nlintOptions {\nabortOnError false\n}\n#' build.gradle && \
-        rm surespot/libs/gcm.jar && \
-        rm surespot/libs/* && \
-        git clone https://code.google.com/r/yugandharguduri-yugandhar/ && \
-        cd yugandharguduri-yugandhar && \
-        git checkout 7f647288103bac2c5552af881f0e217c5b95d78a && \
-        cd .. && \
-        cp -av yugandharguduri-yugandhar/gcm-client-deprecated/src/com ./surespot/src/main/java/ && \
-        find yugandharguduri-yugandhar/ -name '*.jar' -exec rm {} \; && \
+        cp -av $$gcm$$/gcm-client-deprecated/src/com surespot/src/main/java/ && \
         find .google_apis -name '*.jar' -exec rm {} \;
     novcheck=yes
 
diff --git a/srclibs/gcm.txt b/srclibs/gcm.txt
new file mode 100644
index 0000000000..9c3f96c00d
--- /dev/null
+++ b/srclibs/gcm.txt
@@ -0,0 +1,3 @@
+#https://github.com/google/gcm
+Repo Type:git
+Repo:https://code.google.com/r/yugandharguduri-yugandhar/