diff --git a/Makefile b/Makefile
index 222f4b4697e342070021eecf92516bcb297e18bb..c0a660e9d3568b405f22ef9be9978e37021f05fe 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,8 @@ boot.img: Makefile mkboot bootimg_src kernel/arch/arm/boot/zImage-dtb $(FWPATCH)
 	mkdir bootimg_tmp/ramdisk && \
 	   cd bootimg_tmp/ramdisk && \
 	   gzip -dc ../ramdisk.cpio.gz | cpio -i \
-	   && sed -i '/service wpa_supplicant/,+11 s/^/#/' init.hammerhead.rc \
-	   && sed -i '/service p2p_supplicant/,+14 s/^/#/' init.hammerhead.rc \
+	   && sed '/service wpa_supplicant/,/oneshot/ s/^/#/' init.hammerhead.rc > init.hammerhead.rc.tmp && mv init.hammerhead.rc.tmp init.hammerhead.rc \
+	   && sed '/service p2p_supplicant/,/oneshot/ s/^/#/' init.hammerhead.rc > init.hammerhead.rc.tmp && mv init.hammerhead.rc.tmp init.hammerhead.rc \
 	   && printf "none /nexmon/tmp/bin tmpfs size=1M defaults\n" >> fstab.hammerhead \
 	   && printf "none /system/bin aufs br:/nexmon/tmp/bin:/nexmon/bin:/system/bin defaults\n" >> fstab.hammerhead \
 	   && printf "\n\nservice su_daemon /nexmon/bin/su --daemon\n    oneshot\n    class late_start\n    user root\n" >> init.rc