diff --git a/metadata/org.smssecure.smssecure.txt b/metadata/org.smssecure.smssecure.txt
index a76f29160b..e759146c8e 100644
--- a/metadata/org.smssecure.smssecure.txt
+++ b/metadata/org.smssecure.smssecure.txt
@@ -26,12 +26,13 @@ If you want to migrate from TextSecure to SMSSecure:
 Repo Type:git
 Repo:https://github.com/SMSSecure/SMSSecure
 
-Build:0.3.3,6
-    disable=smil
+Build:0.3.3,5
+    disable=builds, merge changes into upstream
+    forcevercode=yes
     commit=66367479a4f57f347b5cbe8f6f8f632adaae7727
     gradle=yes
     rm=libs/*
-    srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278,PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc,ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87
+    srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278,PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc,ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87,AospMms@android-5.1.0_r3
     prebuild=touch signing.properties && \
         pushd $$GradleWitness$$ && \
         gradle jar && \
@@ -39,7 +40,21 @@ Build:0.3.3,6
         cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && \
         sed -i -e '20,22d' build.gradle && \
         pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && \
-        sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle
+        sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && \
+        mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ 
+
+Build:0.3.3,6
+    disable=builds, wait for upstream
+    commit=9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a
+    gradle=yes
+    rm=libs/*.jar
+    srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
+    submodules=yes
+    prebuild=touch signing.properties && \
+        pushd $$GradleWitness$$ && \
+        gradle jar && \
+        popd && \
+        cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
 
 #Auto Update Mode:Version v%v
 Update Check Mode:Tags
diff --git a/srclibs/AospMms.txt b/srclibs/AospMms.txt
new file mode 100644
index 0000000000..770014624a
--- /dev/null
+++ b/srclibs/AospMms.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://android.googlesource.com/platform/packages/apps/Mms/