diff --git a/pentoo/pentoo-installer/Manifest b/pentoo/pentoo-installer/Manifest
index c358681c5..13b4f6d7d 100644
--- a/pentoo/pentoo-installer/Manifest
+++ b/pentoo/pentoo-installer/Manifest
@@ -1,9 +1,9 @@
+AUX 132-and-140.patch 1023 SHA256 7b7f7a1ef3c8b937f6a56544f132eff0640c232d019eeba343f49af680d7d5b5 SHA512 82e2a11cbcb489fda50a489edf5d98388e9d857269d890ca137780d16be9a36ce15f189200376c25e7468822faab4b6c9f1df53d85017d09379c31554ba21a17 WHIRLPOOL c58d3b6756b142c64da07a7554c5c56a83769ec41edd1577a810497ad721e7b8d5136a8adf3fcb5e68afd63ce7b8f8209f9f22db7cad49317e048c4dea7a8fee
 AUX 7500-ext4.patch 732 SHA256 cc139f34f29dbf2d797eb4b4da0f5887a2aea27d130722fb2165ed3338e82e72 SHA512 04c80c3da0987ec013d7fcb5b04def19b10693826c4c2ab8624187b3049eaf9a46609c2237defe3bcaf8fae7ccfc73e3571436d0182c3e732b3801a2d082e553 WHIRLPOOL 3ca4e7fbb23e2aa3a23c46025bbcbf93c0bd61a6108824f4e4abde100e2963ddf707dbf5320ad5442591ceb888a1ca33c931bb9bc369dc1453eb9926fe2b57f5
 AUX 8000-ext4.patch 763 SHA256 e53e752ec4cc3f32e5a70b5f2b4e29a5fb1afce4fc9c8d44f0d97f58009736fb SHA512 42ce2bcc1ffa7484c2c7dcb0fce7afb76b40f2e323d0fd4a11b152c5903566ee8f300951defcacebcf2d3db6e7074aa340e9b969478a7d05c7b99297a900f4b2 WHIRLPOOL 93a982d3d669de34e10c3fbe64593a329d465048d270d4227173c058667d648ad990c7d2bfe8903423fa635dd85aafb832ee8198d2d4babc5321c4ded0c32c64
 AUX auto-set-swap-to-ram.patch 918 SHA256 72650ee8073981afd8786ae8c096b6a793bb4d8f48b12a8ba7e486afcc54669c SHA512 adefd0ecf41d633d033f09d693506b9e241abebb9e729a05ec59db54106a46a4225acfda7590486407792335a4e538125770a8e388366e47e516f1713e9d7c8d WHIRLPOOL 89580cf7b8004b796d59bab4e4d8e92ddc922121120213846e5e97fc070a3106c83832fc05abf3ee90c2490c8d439de05b37c13b26af623a6e5f2c61053a9011
 AUX bugs-65-66.patch 2317 SHA256 efb4802ef20178a16f98cb39137093de4a9e01790cd7550c50e53c692278481c SHA512 694b720ef2521a0ee512a766f6989bc3c5e8e349456c1176d817776910aa8e7e1180ebd4fd342bb0cb1bd3fb893b68bce84655ab19a2bb0a5e662b2a0b115728 WHIRLPOOL 080fc5b5bd95c818067a6702b7cd8a18a6052aa71b88fd4778f8796d2ec35a02f42270ceb14a4b649358989d9dfcaeb37f9b6ce7aa5d2cbd693720816395b7b0
 AUX clean_livecd_use_flags_correctly.patch 552 SHA256 933157da32de8b3f6b0ba0a53dc28e052bfff27d886e4796cf405cf99a14f6d4 SHA512 b7787a33a88e3b145ab7c22710525fc10e268ea0f279dc206d240f73da29454d1ec48ce5ce6a31bb1c0846cb97a6a56962e0fbe1d6f51638f7dec164fe64fbc4 WHIRLPOOL dd4552aa2ed5c5f8df989ec5e93e0140ab0687703313bc45f043c100db44e149ddd449db8574f3a8f2f13149264ec891a7e2c3c41e12f64f5d01c562ec8453b1
-AUX fix-inittab-bug-132.patch 722 SHA256 811a81ccab4b9e5eab38f0bff070a921d435b2995b113828d87fc7b8ba8614a7 SHA512 73f19bcd2244c2cac2ae2455f5d58edaf87a4cb4f0f1e2ee13c2c6c85918ebb2f48698a50ceac5c4b55edd2560983fdc8e4cd453ca89ba15ce823ab5e33ccccd WHIRLPOOL e5c40c2d35b430945d0edb1322eb2ba9d9007d7939e8813187ad810855669493c432eab22834c972741a251a4bee4efc12215ec86cf50e67d094da0c2dfe43d8
 AUX fix-useflags-on-install.diff 455 SHA256 9f0b8542f21d6d06e35f6171d2b6925cc72872fd6724ca8008e5b63f972da796 SHA512 fae7b01232aec28f7f9dfd8536dcd4a8003ac172f686059f316645b8127181398a316bd888f09a4f7e1536e760a82c1a9a00b786ec9e1cd5b777784ab678a76e WHIRLPOOL 9c8afffce5d0f131fc8726c4e0f410ed3c7bb97d15cb7c4eb17dea4ffa5caf8d4afc6ff59a306408239aaa579abfc3af722621da05df47774e8ee3ab0e8d6584
 AUX gpt-support.patch 2864 SHA256 addc6356ff147b8a70f1cd3fffa0e2df2201cbe3e3b36721175c53e94b4b7448 SHA512 6ff7c5a32d1b2958b80e96d9a27391b498a659fe54d867f1c6e1cba9879b13ae17c427e6e24d113774afc601c085c8bcfbff2b8092b7badf35f2a00b5be56b03 WHIRLPOOL 90bac12704749fe61fd51717089e9a81245918e7e3506d6133de109cbfea472653381fae7f646ae509fcb6932b1a506e5b987c309dea5324c60b5681b81fd09a
 AUX more-fixes-for-installer-bugs.patch 4582 SHA256 693ea18c861a941c141b66b4c4d5e3dee112ec3c729bc991708f1b62d74f7784 SHA512 764522f9f3d5ece2b2a432ab200e4ee32b45934c95625b201a85b4a7d32663244e1d1093705eecb01508164c320ea8fce9b8605b034417dffe9a711b666e8033 WHIRLPOOL 2491cfce7c024bdfa94ac46b0282c6ae594c4a1f4c534b88d2c634c97db9f30dc48d8efd7ba3cd6df1f6946a1c0bc193df6e9a05642468ec8d54180db692beed
@@ -20,5 +20,5 @@ EBUILD pentoo-installer-0.1.3.2-r12.ebuild 1209 SHA256 70941edcdc853a607609a335e
 EBUILD pentoo-installer-0.1.3.2-r13.ebuild 1259 SHA256 14a13e75c3cf3d807ade74e5f4ba3229643c4f98aec2d9b128614651f527c3b1 SHA512 0504590b5ffaa81d81f429d9b776393c3bb7a630a20e0eae4a7826be5b5ac760223fa6406e851d3b0fcb83479a5604570dd4f70d0b16314e56718ebe5c0d34bf WHIRLPOOL 5cd069159c307a14f2c7eb95ab0bc8383fb521591a7168308b48433f764819632a641c4fdce6c0986ee8fea835b52aba729e32bb13e14f458fa6be99f786eed4
 EBUILD pentoo-installer-0.1.4-r1.ebuild 754 SHA256 c89850101f3c4554a97bc3330e8652ab9a2f5a7196ea604363371c581bd07fb7 SHA512 4c17ca51557ed6752e46ebfe31b4ed99dadf7136cb6a1cedcf2d931b50ccad11124a6bdefd1899114e821d1be313d2968c3dc99e989a294d0b0c7825da5d835e WHIRLPOOL 7fb68c8b679a055b33165de849af92c3452afd61e4f4587d3e9873f05c7569ab1a51555eed801e4e390d0709760ef36b3c53fc0b27747e84765bdbbaaee3920f
 EBUILD pentoo-installer-0.1.4-r2.ebuild 754 SHA256 5051a7fd6954059a3db69958d379b39013ef8f61b1b5dc3512a29a51ed7907f7 SHA512 82e0e83c46b55f24aba9058980e6790eee5b7459aa3cd43782340484db6421786037a8bd312bb556cebde58ee64fbb9fa4cc921aa20a314cae7a59b8e52d1810 WHIRLPOOL 3621e5ed0ea39b0adf2defbb930b6db224b14fbb69a6d3fe32623c3497a705a721c5b88a3d95d62e126309211180161b18cbc1fdbf322f3fed26832ff51dfa0c
-EBUILD pentoo-installer-0.1.4-r3.ebuild 802 SHA256 5931ba5afd94045851ff30b0b9460c88228b4f2e4678700196c0a0ffdef26a78 SHA512 ccb7ccb1b34481296f1836d6ffb56b084bbc2d41e08ba9ec5de20c4093174802845f50892daee6bdd24f0119c8ad7267d555ab2fa706aafc37c19b511fd2024e WHIRLPOOL 089c35fc1d7e2a5c9e97ff6593bb4b10e36cea6234ba5bd84dadd49284db32f23c8a725752f7bc7fdb87adb5c82442e9ff7a15f3e5f6a650dac6b69bff87b0d2
+EBUILD pentoo-installer-0.1.4-r4.ebuild 794 SHA256 5cb3168dbdcfce273336986551df4034d362917f910540472c9205d6ff5ab99b SHA512 c958e198bc09bee928dfcd477ec259b03306abef8ea77f0d943087cc8d16330e401623c6d712fa1182d152ea4a69d7382e9cf454e4b8ff7f39fe46ae33ed765f WHIRLPOOL f57defd5bf27aabc306fc56b225f7ac195eb604c8d46fb2fb7325a6933cf1b99376477a407cba1554fc9220d42566757a3e84843a660fa8ea9938e489fafa43d
 EBUILD pentoo-installer-0.1.4.ebuild 674 SHA256 59b8fd400303a5db47ffa765879afc99ce8f6e4de908c9c21b39ecf398444f8b SHA512 e11a8a2adc7eedfc670d38adf854569aea1a64fddc4a928d4470e48c9c0e49247842cae0e889cf44f83c94b94a0c9f0166449945a18d0cebe7799bef2f80ccbc WHIRLPOOL 6cec6f05351a2153f0c654465a8db5b3cb7068c60ab6d9e5937c2f2f3a16be00adc3e8f5da8caf2b58339436e433749d11259965ce91437a54456cdbaa798aaa
diff --git a/pentoo/pentoo-installer/files/132-and-140.patch b/pentoo/pentoo-installer/files/132-and-140.patch
new file mode 100644
index 000000000..0f811a1ee
--- /dev/null
+++ b/pentoo/pentoo-installer/files/132-and-140.patch
@@ -0,0 +1,30 @@
+--- pentoo-installer.orig	2013-07-04 01:30:35.913728650 -0400
++++ pentoo-installer	2013-07-04 01:44:18.677276700 -0400
+@@ -251,7 +251,9 @@
+         "2" "vi" 2>$ANSWER
+     case $(cat $ANSWER) in
+         "1") EDITOR="nano" ;;
+-        "2") EDITOR="vi" ;;
++        "2") EDITOR="vi"
++             sed -i 's#/bin/nano#/usr/bin/vi#' ${DISTDIR}/etc/profile
++             ;;
+         *)   EDITOR="nano" ;;
+     esac
+ }
+@@ -716,6 +718,7 @@
+         return 1
+     fi
+     sed -i '/aufs bindist livecd/d' ${DESTDIR}/etc/portage/make.conf
++    ROOT=${DISTDIR} emerge -C app-misc/livecd-tools pentoo/pentoo-livecd
+     mknod -m666 ${DESTDIR}/dev/zero c 1 5
+     mknod -m666 ${DESTDIR}/dev/null c 1 3
+     mknod -m600 ${DESTDIR}/dev/console c 5 1
+@@ -1104,6 +1107,8 @@
+     chroot_mount
+     chroot $DESTDIR /bin/bash <<EOF
+ rc-update del autoconfig default
++rc-update del firmware boot
++rc-update del fixinittab default
+ rc-update add keymaps default
+ mv /etc/inittab.old /etc/inittab
+ mv /etc/init.d/halt.sh.orig /etc/init.d/halt.sh
diff --git a/pentoo/pentoo-installer/files/fix-inittab-bug-132.patch b/pentoo/pentoo-installer/files/fix-inittab-bug-132.patch
deleted file mode 100644
index 3ff4eccf0..000000000
--- a/pentoo/pentoo-installer/files/fix-inittab-bug-132.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pentoo-installer-orig	2013-07-02 23:44:02.497581000 -0400
-+++ pentoo-installer	2013-07-03 00:27:02.535873000 -0400
-@@ -708,9 +708,11 @@
- 
-     rsync -av /mnt/livecd/* ${DESTDIR} 2>&1 >$LOG
-     rsync -av /etc/* ${DESTDIR}/etc/ 2>&1 >>$LOG
-+    mv ${DESTDIR}/etc/inittab.old ${DISTDIR}/etc/inittab 2>&1 >>$LOG
-     rsync -av /root/* ${DESTDIR}/root/ 2>&1 >>$LOG
-     rsync -av /usr/portage ${DESTDIR}/usr/ >>$LOG
-     rsync -av /var/lib/layman/pentoo ${DESTDIR}/var/lib/layman/ >>$LOG
-+    ROOT=${DISTDIR} emerge -C app-misc/livecd-tools pentoo/pentoo-livecd
-     if [ $? -ne 0 ]; then
-         DIALOG --msgbox "Rsync failed (maybe you're out of disk space?). See the log output for more information"
-         return 1
diff --git a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r3.ebuild b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
similarity index 94%
rename from pentoo/pentoo-installer/pentoo-installer-0.1.4-r3.ebuild
rename to pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
index 3bbee32c4..9df606f3d 100644
--- a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r3.ebuild
+++ b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-util/dialog
 
 src_prepare() {
 	epatch "${FILESDIR}"/clean_livecd_use_flags_correctly.patch
-	epatch "${FILESDIR}"/fix-inittab-bug-132.patch
+	epatch "${FILESDIR}"/132-and-140.patch
 }
 
 src_install() {