diff --git a/metadata/org.damazio.notifier.txt b/metadata/org.damazio.notifier.txt
index dab0d00e34..67ba93532e 100644
--- a/metadata/org.damazio.notifier.txt
+++ b/metadata/org.damazio.notifier.txt
@@ -18,7 +18,7 @@ Build:0.3,12
     disable=Not published upstream
     commit=7c31ec8497b5
     subdir=AndroidNotifier
-    prebuild=mv ../NotifierLib/src/org/damazio/notifier/protocol src/org/damazio/notifier/ && mv ../NotifierLib/lib/* libs/
+    prebuild=echo "source.dir=../NotifierLib/src;src" > ant.properties && mv ../NotifierLib/lib/* libs/
 
 Maintainer Notes:
 The build is disabled because it was never published by upstream, and judging
diff --git a/metadata/org.projectmaxs.main.txt b/metadata/org.projectmaxs.main.txt
index c7cdecffd2..942a0de1d3 100644
--- a/metadata/org.projectmaxs.main.txt
+++ b/metadata/org.projectmaxs.main.txt
@@ -80,8 +80,13 @@ Build:0.0.1.11,12
     subdir=main
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=main
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.bluetooth.txt b/metadata/org.projectmaxs.module.bluetooth.txt
index 79348b6ff8..1573aaf3ff 100644
--- a/metadata/org.projectmaxs.module.bluetooth.txt
+++ b/metadata/org.projectmaxs.module.bluetooth.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-bluetooth/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.bluetoothadmin.txt b/metadata/org.projectmaxs.module.bluetoothadmin.txt
index 546d6dae27..23edd2b1cd 100644
--- a/metadata/org.projectmaxs.module.bluetoothadmin.txt
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-bluetoothadmin/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.clipboard.txt b/metadata/org.projectmaxs.module.clipboard.txt
index 484bce574f..24b212e329 100644
--- a/metadata/org.projectmaxs.module.clipboard.txt
+++ b/metadata/org.projectmaxs.module.clipboard.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-clipboard/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.contactsread.txt b/metadata/org.projectmaxs.module.contactsread.txt
index d802fdb250..549d373067 100644
--- a/metadata/org.projectmaxs.module.contactsread.txt
+++ b/metadata/org.projectmaxs.module.contactsread.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-contactsread/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.fileread.txt b/metadata/org.projectmaxs.module.fileread.txt
index 4eba26ea57..afeb170e8b 100644
--- a/metadata/org.projectmaxs.module.fileread.txt
+++ b/metadata/org.projectmaxs.module.fileread.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-fileread/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.filewrite.txt b/metadata/org.projectmaxs.module.filewrite.txt
index 47610c78ec..091391e7ff 100644
--- a/metadata/org.projectmaxs.module.filewrite.txt
+++ b/metadata/org.projectmaxs.module.filewrite.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-filewrite/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.phonestateread.txt b/metadata/org.projectmaxs.module.phonestateread.txt
index 8213467660..6ab4a1e9de 100644
--- a/metadata/org.projectmaxs.module.phonestateread.txt
+++ b/metadata/org.projectmaxs.module.phonestateread.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-phonestateread/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.ringermode.txt b/metadata/org.projectmaxs.module.ringermode.txt
index 6d342ee3b9..ff7a6a303d 100644
--- a/metadata/org.projectmaxs.module.ringermode.txt
+++ b/metadata/org.projectmaxs.module.ringermode.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-ringermode/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.smsnotify.txt b/metadata/org.projectmaxs.module.smsnotify.txt
index 8af579bd7c..c2e1a41e26 100644
--- a/metadata/org.projectmaxs.module.smsnotify.txt
+++ b/metadata/org.projectmaxs.module.smsnotify.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-smsnotify/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.smsread.txt b/metadata/org.projectmaxs.module.smsread.txt
index 5408bb2487..a1640c595b 100644
--- a/metadata/org.projectmaxs.module.smsread.txt
+++ b/metadata/org.projectmaxs.module.smsread.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-smsread/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.smssend.txt b/metadata/org.projectmaxs.module.smssend.txt
index 5dc5a269bc..2b18aaa01e 100644
--- a/metadata/org.projectmaxs.module.smssend.txt
+++ b/metadata/org.projectmaxs.module.smssend.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-smssend/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.module.smswrite.txt b/metadata/org.projectmaxs.module.smswrite.txt
index 1e3fc928af..6a38c55675 100644
--- a/metadata/org.projectmaxs.module.smswrite.txt
+++ b/metadata/org.projectmaxs.module.smswrite.txt
@@ -102,8 +102,15 @@ Build:0.0.1.11,12
         make module-smswrite/Makefile
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/metadata/org.projectmaxs.transport.xmpp.txt b/metadata/org.projectmaxs.transport.xmpp.txt
index 779a82660c..f6fd8d0b16 100644
--- a/metadata/org.projectmaxs.transport.xmpp.txt
+++ b/metadata/org.projectmaxs.transport.xmpp.txt
@@ -84,8 +84,14 @@ Build:0.0.1.11,12
     submodules=yes
     prebuild=make prebuild
 
+Build:0.0.1.12,13
+    commit=0.0.1.12
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.11
-Current Version Code:12
+Current Version:0.0.1.12
+Current Version Code:13
 
diff --git a/srclibs/MenuComponent.txt b/srclibs/MenuComponent.txt
index f4e08c28bc..d628451fe5 100644
--- a/srclibs/MenuComponent.txt
+++ b/srclibs/MenuComponent.txt
@@ -2,7 +2,7 @@ Repo Type:git
 Repo:https://github.com/mariotaku/Android-MenuComponent.git
 
 Subdir:library
-
+Prepare:mkdir -p libs && echo -e 'android.library=true\ntarget=android-19' >> project.properties
 Update Project:Yes