diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
index 809d55e4ac..41b9fdf8b2 100644
--- a/metadata/com.nononsenseapps.notepad.txt
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -1,7 +1,8 @@
 Categories:Office
 License:Apache2
 Web Site:https://github.com/spacecowboy/NotePad
-Source Code:https://github.com/spacecowboy/NotePad
+Source Code:http://www.nononsenseapps.com/
+#Source Code:https://github.com/spacecowboy/NotePad/blob/HEAD/README.md
 Issue Tracker:https://github.com/spacecowboy/NotePad/issues
 Bitcoin:16DUL1X4yARfM88GN7TV6Y3wQwqrstJs7A
 
@@ -71,9 +72,22 @@ Build:5.5,55000
     subdir=app
     patch=remove_play_configs.patch
     gradle=free
-    prebuild=rm -rf *.zip *.png *.7z *.psd src/play src/playBeta src/androidTest
+    srclibs=Orgparser@7ab685e517e2e00c94b11ca58626bba19cb9300a
+    rm=app/compile-libs/*jar,app/libs/*.jar
+    prebuild=rm -rf *.zip *.png *.7z *.psd src/play src/playBeta src/androidTest && \
+        sed -i -e 's/gradle:0.13.0/gradle:0.12.0/g' build.gradle ../build.gradle && \
+        cp -fR $$Orgparser$$/src/main/java/org src/free/java/ && \
+        sed -i -e '/support-v4/acompile "com.google.android.apps.dashclock:dashclock-api:2.0.0"' build.gradle
+
+Maintainer Notes:
+* INFO: replaced dashclock-api-r1.jar with dashclock-api:2.0.0
+* INFO: removed androidannotations-3.0.1.jar, if needed add
+        "compile 'org.androidannotations:androidannotations:3.0.1'"
+* INFO: replaced orgparser with source-copy
+* INFO: downgrade gradle for now
+* INFO: remove play-sevices
+* INFO: verCode is split up, which braeks UCM
+.
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:5.5
-Current Version Code:55000
diff --git a/srclibs/Orgparser.txt b/srclibs/Orgparser.txt
new file mode 100644
index 0000000000..4e1a281af1
--- /dev/null
+++ b/srclibs/Orgparser.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/spacecowboy/orgparser