diff --git a/prebuilt/common/bin/verify_cache_partition_size.sh b/prebuilt/common/bin/verify_cache_partition_size.sh
new file mode 100644
index 00000000..748f6b2a
--- /dev/null
+++ b/prebuilt/common/bin/verify_cache_partition_size.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Force /system dalvik-cache on /data instead of /cache if is not large enough
+#
+
+CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
+if [ $CACHESIZE \< 60000 ]
+then
+  echo "dalvik.vm.dexopt-data-only=1" >> /system/build.prop > /dev/null 2>&1
+fi
diff --git a/products/common.mk b/products/common.mk
index 69fbd124..efc1cda3 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -59,6 +59,7 @@ include frameworks/base/data/sounds/AudioPackage4.mk
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
+    vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
     vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
     vendor/cyanogen/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \