diff --git a/product/zram.mk b/product/zram.mk
new file mode 100644
index 0000000..5841f35
--- /dev/null
+++ b/product/zram.mk
@@ -0,0 +1,3 @@
+# ZRAM
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.zram=true
diff --git a/rootdir/init.qcom.power.rc b/rootdir/init.qcom.power.rc
index 3c9a5dc..91eee7f 100644
--- a/rootdir/init.qcom.power.rc
+++ b/rootdir/init.qcom.power.rc
@@ -123,3 +123,6 @@ on property:sys.boot_completed=1
 
     rm /data/system/perfd/default_values
     start perfd
+
+    swapon_all fstab.qcom
+    write /proc/sys/vm/swappiness 100
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index d4a6217..6b4ea82 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -25,6 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+import init.qcom.power.rc
 import init.qcom.usb.rc
 import init.target.rc
 import init.qcom.factory.rc
@@ -856,16 +857,9 @@ service wifi-crda /system/bin/sh /system/etc/init.crda.sh
    disabled
    oneshot
 
-service config-zram /system/bin/sh /system/etc/init.qcom.zram.sh
-   class late_start
-   user root
-   disabled
-   oneshot
-
 on property:sys.boot_completed=1
     start qcom-post-boot
     start qti-testscripts
-    start config-zram
 
 service atfwd /system/bin/ATFWD-daemon
     class late_start
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index e6870e7..d3375ed 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -98,11 +98,6 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
 on init
    write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
 
-#enable zram
-on property:ro.config.zram=true
-    swapon_all fstab.qcom
-    write /proc/sys/vm/swappiness 100
-
 service qfp-daemon /system/bin/qfp-daemon
    class late_start
    user system