diff --git a/app-portage/squashed-portage/ChangeLog b/app-portage/squashed-portage/ChangeLog
index 97a8d075..556e1787 100644
--- a/app-portage/squashed-portage/ChangeLog
+++ b/app-portage/squashed-portage/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squashed-portage-0.18 (25 Sep 2014)
+
+  25 Sep 2014; Justin Lecher <jlec@gentoo.org> +squashed-portage-0.18.ebuild:
+  Version BUmp
+
   23 Sep 2014; Justin Lecher <jlec@gentoo.org> squashed-portage-0.17.ebuild,
   squashed-portage-9999.ebuild:
   Fix script installation part II
diff --git a/app-portage/squashed-portage/Manifest b/app-portage/squashed-portage/Manifest
index 1040d507..451a9b7e 100644
--- a/app-portage/squashed-portage/Manifest
+++ b/app-portage/squashed-portage/Manifest
@@ -1,2 +1,3 @@
 DIST squashed-portage-0.16.tar.xz 5364 SHA256 39de858ad75a5f370db463922b73bb3e1c622068e97ca2e76761ab7313bc40e6 SHA512 e113bc0d52c76fd6305c5459954ba0e5f5c36c5c40c10669dbc0f9e77e0ddc5560b634868a47af5b4263bdcc80c705f66a5eb562a98c7d1697a00ae19befa232 WHIRLPOOL 9757c41c8a422c081e2b5f4ca105b150863c3581567b38388b82770b796c284a337fa79fd32fec8c2c022a350e25dc2976ad1a12cb3e6b672a4aafdfb465fdbf
 DIST squashed-portage-0.17.tar.xz 5712 SHA256 0e605156acd066790cd6dad1e9508d85c271b90281c84c711d6df5572a880a64 SHA512 fc4ee8b9ec6ed3d7c86e5aa1745d0c9872a479a04374d92ba3fe5c2d9cd319bb62d3a013d3af3bdd99f2e0222759b39401c693ef3668ef5727aa438f8e0e34e3 WHIRLPOOL 2298779df97a072e8afc648b96c32ef6f454940cfac01e390d700aa7738f82ae5a291eca4ca7a72c6e2569c83fa9c1845852f9812660686fef32c2055382382d
+DIST squashed-portage-0.18.tar.xz 5712 SHA256 b0114046aacfebdca7ab348abcb15f5ab598a3ef34d62cadf52f05ad72e3cddc SHA512 5dbc69c0c0008d051bb0cb805db071eaaf5969359fb40a03fc3f1c103a360b04fadb3b391dafc9537face41862eaff5fa9fcd0a57cc9ce552fb78d2dfe6d17b7 WHIRLPOOL 275f541ae9428a6d5784a5f48e1ba9df93bed4c9cfa4f8b94fd529558124c8aede2339d7b3c133bffccc3b95125e880afc04c5753aec5426f16e48bbe1a20e8d
diff --git a/app-portage/squashed-portage/squashed-portage-0.18.ebuild b/app-portage/squashed-portage/squashed-portage-0.18.ebuild
new file mode 100644
index 00000000..a8caaa9f
--- /dev/null
+++ b/app-portage/squashed-portage/squashed-portage-0.18.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib prefix python-r1 systemd
+
+DESCRIPTION="Tools to handle squashed portage"
+HOMEPAGE="http://www.j-schmitz.net/projects/squashed-portage/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="aufs zsync"
+
+RDEPEND="
+	!<sys-apps/openrc-0.13
+	dev-python/progressbar[${PYTHON_USEDEP}]
+	sys-fs/squashfs-tools:0
+	aufs? ( sys-fs/aufs-util )
+	zsync? ( net-misc/zsync )"
+DEPEND="app-misc/ca-certificates[cacert]"
+
+RESTRICT="mirror"
+
+src_prepare() {
+	eprefixify *
+	sed \
+		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
+		-i get-squashed-portage || die
+
+	if use zsync; then
+		sed \
+			-e 's:get-squashed-portage:get-squashed-portage -z:g' \
+			-i squashed-portage.init || die
+	fi
+}
+
+src_install() {
+	dobin get-squashed-portage
+
+	python_foreach_impl python_newscript fetch-squashed-portage.py fetch-squashed-portage
+
+	newinitd ${PN}.init ${PN}
+	newconfd ${PN}.confd ${PN}
+
+	insinto /etc/
+	doins ${PN}.conf
+
+	systemd_dounit *.service *.mount *.target
+	systemd_dotmpfilesd squashed-portage.tmpfiles.conf
+	use aufs && systemd_newunit usr-portage.mount.aufs usr-portage.mount
+}
+
+pkg_postinst() {
+	einfo "Starting with 0.16 some fundamental things have changed:"
+	einfo " - The get-squashed-portage does no longer stop the squashed-portage service. As a result,"
+	einfo "   you have to change your sync to something like:"
+	einfo ""
+	einfo "     /etc/init.d/squashed-portage stop"
+	einfo "     get-squashed-portage"
+	einfo "     /etc/init.d/squashed-portage start"
+	einfo ""
+	einfo " - It is no longer supported to have anything mounted below PORTDIR."
+	einfo "   You are encouraged to set PKGDIR / DISTDIR in /etc/portage/make.conf or make sure you umount/remount"
+	einfo "   the filesystems before starting or stopping the squashed-portage service."
+	echo ""
+	ewarn "The config file location changed"
+	ewarn "please check /etc/${PN}.conf"
+}