diff --git a/prebuilt/common/bin/otablock b/prebuilt/common/bin/otablock
new file mode 100644
index 0000000..b1a93f2
--- /dev/null
+++ b/prebuilt/common/bin/otablock
@@ -0,0 +1,9 @@
+#!/system/bin/sh
+
+
+## If these activities are installed, get rid of them. We don't want updates
+## coming in from outside CM
+
+exec 2>/dev/null
+pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity
+pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 9cdc8ea..c9c79da 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -49,3 +49,12 @@
     user root
     oneshot
     disabled
+
+# Block stock OTA activities
+service otablock /system/bin/otablock
+    user root
+    oneshot
+    disabled
+
+on property:dev.bootcomplete=1
+    start otablock