diff --git a/pentoo/pentoo-installer/Manifest b/pentoo/pentoo-installer/Manifest
index e515cd8d5..c2b33d10a 100644
--- a/pentoo/pentoo-installer/Manifest
+++ b/pentoo/pentoo-installer/Manifest
@@ -10,9 +10,11 @@ AUX pentoo-installer.desktop 213 SHA256 81e5bdc9639e24a7b727c571f3db4dd76020f4f5
 AUX root-size-warnings.patch 1703 SHA256 ea2686c14d6d4b2cab9b22f22ea70ab96e956241bce6dd30fd3ec3eb5e838598 SHA512 7f74f6743af6a53de0a3b0a605182ccb63c894a54c70272fdc145f7f2e1de39c8abd0b651895879d5513862ba0010bbbfcaab104456d389f9cf1a52d57dcdf94 WHIRLPOOL f0136731bfa7ced49dae0df97e61bee92b216e9684a3b01d2860d30925366bbfb74af38d714157d83c759486e09d6f62613b11c6338c8570a9b565247289ff33
 AUX test_for_xfs_before_freeze.patch 1226 SHA256 dd6e7919caeab49d69cbc2640131c809ccd2c2a9dd698f34602834ebac0bc5e5 SHA512 3c0071e1d7a18fde4efd0dc013babe1766bb34e496e6e9c340c09757cc3f750814c53e0405229cfb3a1961c041752a2baece547a05d80f64bdbdc182aa250451 WHIRLPOOL dca8e29d59b9e41bb019f1983f86881c3a34dccddff42b61b61b24616956f083e3536d46af60a8f1619a1e45af08c314b7199e604faa575b2edf7f6524f7f0ef
 AUX uefi-support.patch 7383 SHA256 eb3d5d391d0d4aec17071483beb74617b07119b3b100ec1106d16252d0bdd965 SHA512 0e0cd1d756715cc36f55d7e5b909cbbd7410388dac08d3056ff1423dfed9d748b67b17bb0aa05710928ee554db44b1b5fc51eeb1ff521881eec7066e0715d8ac WHIRLPOOL 187e54c7a57b2dcc7bb72fd3cc7b89a14eaf60812b7c4b61c6fdff51a03edc723cfc92660f64e951c93ea84aec90de9f2e62fd1cc4a3aba75294ecd9f7e82afc
+AUX uefi-warn-unsupported.patch 967 SHA256 fab3b07ed2b798cae18f06e4a3e2632ac64205c76675246d4e39ef9d876c296c SHA512 a0c769d3cfee5b4109dae0b889dfe8d409bdb238d920568cd7d4ff35bb612292f365e2db2c768053f21d6887b54436daf02f4d1d2356729ad9c85c16469dfd56 WHIRLPOOL 0ac139f48d78cf72f0e0854ea900465e79d55944227b9890bde3b5c471031150075b340a2c37c6914487b99dd297c20d94aabe86d90626d99883118f5e0c085f
 AUX useradd-bug70.patch 1662 SHA256 c24b1200771fb5ae891e3a0d425cb5e637e30679edea4623f54beb612152dbc2 SHA512 015c9bf8482b873e0c2da6b0510e1bc45e5a587d6dfdcdeaeafaed454efdcf7b3d3cda5c3f278d90c96b074c8e3dc57493965ccf6a9b62d57a43e42a4e39775e WHIRLPOOL 9d5a031f3a1f628dc4c2d370dc6b2e47001d8b9af01df0325afaa54a585b12bcf853ac6ebb7fafbf848f58ae2e28be69d004a92b35f0c1c968225577d68e5473
 AUX useradd_password_prompt.patch 607 SHA256 2279050c7461b26cec6983b4170bbf6586f99a8719f185612c6e35160686e643 SHA512 d7426d67c10965c5119c39f34eb7cc8627900cb89d76cacaca8e33dd289ce26d6e397c42888e7e0ef9f7d7e2396df3c18d2c666a6b1a3e0be6ea164ebcca11bc WHIRLPOOL 1f4f8c0bd2a2438c71c3a8e707fd2534fa845548e71178de1bf743e34a690635a305684a73d28a4dee73fb1412ddfff34679872a8dde7a5e60f34271f4688f76
 DIST pentoo-installer-0.1.3.2.tar.xz 20368 SHA256 5ea5931458018f8422eebd9a5968ca28054607e0643df0c53564abcf7db46e9a SHA512 534ee533456ad3413b9eef99894e8e185e96328695bcf43ba6ee757bcfbde3628750504dc258240c9c4f7155bb3f061703dd8e2a8591b63c498b78d2cecc6539 WHIRLPOOL 02d4f5dae9346b7720cf92d5d36ecdb1ad9a1b9dd166f20adf0f5e2871173a93887650a9948147e4b97ffe9fb5872cac8373de3f18d47bd24b667b4cace2440c
 EBUILD pentoo-installer-0.1.3.2-r10.ebuild 1102 SHA256 7fbb0550bdc524547f1a868df2b4aada29463aec8555449d4a2ff4bc264ddb8d SHA512 3b05688ea24b10ddb5e6ea692c115ac10874f67de39db4180723c5896d2e03f6a72c7754e5d62a9ad4c3a49072ff064a360e4011fc20cc35a9db25ce2786669b WHIRLPOOL b335ddc77468c4c4a0f1e2252bef9f720a2ae6bea98052c6a910fe444c058e8800e141e1e8ece4a37eb6026f4fefcb84966f310c5aad3cd6d95699a5fad50832
 EBUILD pentoo-installer-0.1.3.2-r11.ebuild 1152 SHA256 425c30207553c5f4e7dc5238b4bcecd0802fc3d19e45b7768a0d1a01a1ac2cdd SHA512 a49cb6fc3909cb8944cfb5a086f0fc0791e64a3e2545013e65d4a3cb3ac535c978923f063e37ea5ab45cc5f29b827dfa53c4fd81b1649bd98ff31235d7571932 WHIRLPOOL 4d0be92591c014dd25568cb4bceed9eb1f880ed49bd29c14ae3e7fffc474a5822d3289667abcc74ca92419d7484a0537ca43b5830af37497ace2a3a95b42abed
 EBUILD pentoo-installer-0.1.3.2-r12.ebuild 1209 SHA256 70941edcdc853a607609a335e9d81a84b30906781651d1e333b3cf2cc525ccde SHA512 3d035a0b434b0f557806c2ae6571f47cf4de64ad5a2c0a5fdbdd20f5179f9bfa2107fdfb4dcef30e4d196242228cde7cf215c4ee5b49f088f326bdd8c2b220a6 WHIRLPOOL c108a2773a326925330f1d2de0bc4c414fd438ee9453d32da5e85550784f4d23722a34bacb6e785fb4d97ccc73c50db71ac1470551cfac62312cdc6bb9d4cbf6
+EBUILD pentoo-installer-0.1.3.2-r13.ebuild 1259 SHA256 14a13e75c3cf3d807ade74e5f4ba3229643c4f98aec2d9b128614651f527c3b1 SHA512 0504590b5ffaa81d81f429d9b776393c3bb7a630a20e0eae4a7826be5b5ac760223fa6406e851d3b0fcb83479a5604570dd4f70d0b16314e56718ebe5c0d34bf WHIRLPOOL 5cd069159c307a14f2c7eb95ab0bc8383fb521591a7168308b48433f764819632a641c4fdce6c0986ee8fea835b52aba729e32bb13e14f458fa6be99f786eed4
diff --git a/pentoo/pentoo-installer/files/uefi-warn-unsupported.patch b/pentoo/pentoo-installer/files/uefi-warn-unsupported.patch
new file mode 100644
index 000000000..7f9ac8dbb
--- /dev/null
+++ b/pentoo/pentoo-installer/files/uefi-warn-unsupported.patch
@@ -0,0 +1,22 @@
+--- setup	2013-03-07 14:46:52.635539065 -0500
++++ setup	2013-03-07 14:49:30.042543280 -0500
+@@ -266,7 +266,7 @@
+         local pt=
+         DIALOG --menu "Select a Partition Table to Use" 10 35 3 \
+             "1" "msdos (default)" \
+-            "2" "gpt" 2>$ANSWER
++            "2" "gpt (unsupported)" 2>$ANSWER
+         [ "${ANSWER}" = "" ] && pt='msdos'
+         case "$(cat $ANSWER)" in
+             "1")
+@@ -1175,8 +1175,8 @@
+     DIALOG --colors --menu "Which bootloader would you like to use?  Grub is the Pentoo default.\n\n" \
+         12 75 4 \
+         "GRUB" "Use the GRUB bootloader (default)" \
+-        "UEFI-GRUB" "Use GRUB2 and UEFI" \
+-        "UEFI" "Boot kernel directly by UEFI" \
++        "UEFI-GRUB" "Use GRUB2 and UEFI (unsupported)" \
++        "UEFI" "Boot kernel directly by UEFI (unsupported)" \
+         "None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" 2>$ANSWER
+     case $(cat $ANSWER) in
+         "GRUB") dogrub ;;
diff --git a/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r13.ebuild b/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r13.ebuild
new file mode 100644
index 000000000..c2303d621
--- /dev/null
+++ b/pentoo/pentoo-installer/pentoo-installer-0.1.3.2-r13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="ncurses based installer for pentoo, based on the Arch Linux installer"
+HOMEPAGE="http://gitorious.org/pentoo/pentoo-installer"
+SRC_URI="http://dev.pentoo.ch/~jensp/distfiles/$P.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="dev-util/dialog
+	|| ( <sys-boot/grub-1
+	     <sys-boot/grub-static-1 )
+	net-misc/rsync"
+
+src_prepare() {
+	epatch "${FILESDIR}"/8000-ext4.patch
+	epatch "${FILESDIR}"/fix-useflags-on-install.diff
+	epatch "${FILESDIR}"/more-fixes-for-installer-bugs.patch
+	epatch "${FILESDIR}"/auto-set-swap-to-ram.patch
+	epatch "${FILESDIR}"/bugs-65-66.patch
+	epatch "${FILESDIR}"/root-size-warnings.patch
+	epatch "${FILESDIR}"/useradd-bug70.patch
+	epatch "${FILESDIR}"/gpt-support.patch
+	epatch "${FILESDIR}"/uefi-support.patch
+	epatch "${FILESDIR}"/test_for_xfs_before_freeze.patch
+	epatch "${FILESDIR}"/useradd_password_prompt.patch
+	epatch "${FILESDIR}"/uefi-warn-unsupported.patch
+}
+
+src_install() {
+	newsbin setup $PN
+	domenu "${FILESDIR}"/pentoo-installer.desktop
+	insinto /root/Desktop/
+	doins "${FILESDIR}"/pentoo-installer.desktop
+}