diff --git a/metadata/org.projectmaxs.main.txt b/metadata/org.projectmaxs.main.txt
index c7cdecffd2..a2c87686db 100644
--- a/metadata/org.projectmaxs.main.txt
+++ b/metadata/org.projectmaxs.main.txt
@@ -61,9 +61,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=main
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.bluetooth.txt b/metadata/org.projectmaxs.module.bluetooth.txt
index 79348b6ff8..d5774d4248 100644
--- a/metadata/org.projectmaxs.module.bluetooth.txt
+++ b/metadata/org.projectmaxs.module.bluetooth.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-bluetooth
-    init=cd .. && \
-        make module-bluetooth/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.bluetoothadmin.txt b/metadata/org.projectmaxs.module.bluetoothadmin.txt
index 546d6dae27..4bb4535d12 100644
--- a/metadata/org.projectmaxs.module.bluetoothadmin.txt
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-bluetoothadmin
-    init=cd .. && \
-        make module-bluetoothadmin/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.clipboard.txt b/metadata/org.projectmaxs.module.clipboard.txt
index 484bce574f..6a391f0d1c 100644
--- a/metadata/org.projectmaxs.module.clipboard.txt
+++ b/metadata/org.projectmaxs.module.clipboard.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-clipboard
-    init=cd .. && \
-        make module-clipboard/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.contactsread.txt b/metadata/org.projectmaxs.module.contactsread.txt
index d802fdb250..2701ccca8d 100644
--- a/metadata/org.projectmaxs.module.contactsread.txt
+++ b/metadata/org.projectmaxs.module.contactsread.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-contactsread
-    init=cd .. && \
-        make module-contactsread/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.fileread.txt b/metadata/org.projectmaxs.module.fileread.txt
index 4eba26ea57..5617c6ba86 100644
--- a/metadata/org.projectmaxs.module.fileread.txt
+++ b/metadata/org.projectmaxs.module.fileread.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-fileread
-    init=cd .. && \
-        make module-fileread/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.filewrite.txt b/metadata/org.projectmaxs.module.filewrite.txt
index 47610c78ec..4dc8e55bce 100644
--- a/metadata/org.projectmaxs.module.filewrite.txt
+++ b/metadata/org.projectmaxs.module.filewrite.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-filewrite
-    init=cd .. && \
-        make module-filewrite/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.phonestateread.txt b/metadata/org.projectmaxs.module.phonestateread.txt
index 8213467660..20fe5975ff 100644
--- a/metadata/org.projectmaxs.module.phonestateread.txt
+++ b/metadata/org.projectmaxs.module.phonestateread.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-phonestateread
-    init=cd .. && \
-        make module-phonestateread/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.ringermode.txt b/metadata/org.projectmaxs.module.ringermode.txt
index 6d342ee3b9..a92fbe4eed 100644
--- a/metadata/org.projectmaxs.module.ringermode.txt
+++ b/metadata/org.projectmaxs.module.ringermode.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-ringermode
-    init=cd .. && \
-        make module-ringermode/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.smsnotify.txt b/metadata/org.projectmaxs.module.smsnotify.txt
index 8af579bd7c..ae2ce7cbc7 100644
--- a/metadata/org.projectmaxs.module.smsnotify.txt
+++ b/metadata/org.projectmaxs.module.smsnotify.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-smsnotify
-    init=cd .. && \
-        make module-smsnotify/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.smsread.txt b/metadata/org.projectmaxs.module.smsread.txt
index 5408bb2487..4819e51a84 100644
--- a/metadata/org.projectmaxs.module.smsread.txt
+++ b/metadata/org.projectmaxs.module.smsread.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-smsread
-    init=cd .. && \
-        make module-smsread/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.smssend.txt b/metadata/org.projectmaxs.module.smssend.txt
index 5dc5a269bc..6179fe0413 100644
--- a/metadata/org.projectmaxs.module.smssend.txt
+++ b/metadata/org.projectmaxs.module.smssend.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-smssend
-    init=cd .. && \
-        make module-smssend/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.module.smswrite.txt b/metadata/org.projectmaxs.module.smswrite.txt
index 1e3fc928af..7a98afdb84 100644
--- a/metadata/org.projectmaxs.module.smswrite.txt
+++ b/metadata/org.projectmaxs.module.smswrite.txt
@@ -75,11 +75,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=module-smswrite
-    init=cd .. && \
-        make module-smswrite/Makefile
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9
diff --git a/metadata/org.projectmaxs.transport.xmpp.txt b/metadata/org.projectmaxs.transport.xmpp.txt
index 779a82660c..3a7da01cdf 100644
--- a/metadata/org.projectmaxs.transport.xmpp.txt
+++ b/metadata/org.projectmaxs.transport.xmpp.txt
@@ -61,10 +61,7 @@ Build:0.0.1.7,8
     prebuild=make prebuild
 
 Build:0.0.1.8,9
-    commit=0.0.1.8
-    subdir=transport-xmpp
-    submodules=yes
-    prebuild=make prebuild
+    disable=build fails
 
 Build:0.0.1.9,10
     commit=0.0.1.9