diff --git a/x11-drivers/snail/Manifest b/x11-drivers/snail/Manifest
index f87b7705..795fa0df 100644
--- a/x11-drivers/snail/Manifest
+++ b/x11-drivers/snail/Manifest
@@ -1,2 +1,3 @@
 DIST snail-1.2.6.tar.bz2 628927 RMD160 64a1c556fc72729ea19e25355769b528187d9542 SHA1 d7381c4c86dcd3c08ceb8d88e2a882aafa90a9d7 SHA256 3b4f81d3a2b46281bf494343ecdf0980b231cfe558e57f1403ea873ddcc35196
-EBUILD snail-1.2.6.ebuild 541 RMD160 e031d0113153de3363e9fa4df36767780304afcc SHA1 2fb9578c0e53305575a4e0cb048703c45db49066 SHA256 c4a7d1f61fd64d26a07a030af04b66c112d45f936ccb0cb0a04177769abf687c
+EBUILD snail-1.2.6.ebuild 895 RMD160 f74efe08bdfeb7e29b4f4172d6a7b31a056df4fa SHA1 d87dabe01e48f1452e6ca601c0f041ad1da7cc6c SHA256 a1d13fc09b44be9144ca2aa20ace9b4ab783554f417752994c67323f2e86f660
+EBUILD snail-9999.ebuild 895 RMD160 f74efe08bdfeb7e29b4f4172d6a7b31a056df4fa SHA1 d87dabe01e48f1452e6ca601c0f041ad1da7cc6c SHA256 a1d13fc09b44be9144ca2aa20ace9b4ab783554f417752994c67323f2e86f660
diff --git a/x11-drivers/snail/snail-1.2.6.ebuild b/x11-drivers/snail/snail-1.2.6.ebuild
index 47ec9019..da41fa37 100644
--- a/x11-drivers/snail/snail-1.2.6.ebuild
+++ b/x11-drivers/snail/snail-1.2.6.ebuild
@@ -3,32 +3,46 @@
 # $Header: $
 
 EAPI=4
-inherit eutils
+
+EGIT_REPO_URI="git://github.com/backbone/snail.git"
+
+[[ 9999 == ${PV} ]] && vcs=git
+
+inherit $vcs eutils
+
+if [[ 9999 != ${PV} ]]; then
+	SRC_URI="ftp://backbone.ws/projects/snail/${P}.tar.bz2"
+	KEYWORDS="-* ~x86 ~amd64"
+fi
 
 DESCRIPTION="Snail - nVidia Optimus support"
-
-SRC_URI="ftp://backbone.ws/projects/snail/${P}.tar.bz2"
-
 HOMEPAGE="https://chili.backbone.ws/projects/snail"
 
-KEYWORDS="-* ~x86 ~amd64"
-
-SLOT="0"
-
 LICENSE="GPL-3"
-
+SLOT="0"
 IUSE=""
 
 DEPEND="x11-drivers/nvidia-drivers
+        sys-power/bbswitch
         sys-apps/dmidecode"
 
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	if [[ 9999 == ${PV} ]] ; then
+		# Allow user patches to be applied without modifying the ebuild
+		epatch_user
+	fi
+}
+
 src_install() {
-	emake install DESTDIR="${D}" || die
+	if [[ 9999 == ${PV} ]] ; then
+		emake install DESTDIR="${D}"
+	else
+		emake install DESTDIR="${D}" || die
+	fi
 }
 
 pkg_postinst() {
 	snail.configure
 }
-
diff --git a/x11-drivers/snail/snail-9999.ebuild b/x11-drivers/snail/snail-9999.ebuild
index afd64b3f..da41fa37 100644
--- a/x11-drivers/snail/snail-9999.ebuild
+++ b/x11-drivers/snail/snail-9999.ebuild
@@ -4,27 +4,22 @@
 
 EAPI=4
 
-inherit eutils
+EGIT_REPO_URI="git://github.com/backbone/snail.git"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/backbone/snail.git"}
-	inherit git-2
-	KEYWORDS=""
-else
+[[ 9999 == ${PV} ]] && vcs=git
+
+inherit $vcs eutils
+
+if [[ 9999 != ${PV} ]]; then
 	SRC_URI="ftp://backbone.ws/projects/snail/${P}.tar.bz2"
 	KEYWORDS="-* ~x86 ~amd64"
 fi
 
 DESCRIPTION="Snail - nVidia Optimus support"
-
-SRC_URI="ftp://backbone.ws/projects/snail/${P}.tar.bz2"
-
 HOMEPAGE="https://chili.backbone.ws/projects/snail"
 
-SLOT="0"
-
 LICENSE="GPL-3"
-
+SLOT="0"
 IUSE=""
 
 DEPEND="x11-drivers/nvidia-drivers
@@ -34,14 +29,14 @@ DEPEND="x11-drivers/nvidia-drivers
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ 9999 == ${PV} ]] ; then
 		# Allow user patches to be applied without modifying the ebuild
 		epatch_user
 	fi
 }
 
 src_install() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ 9999 == ${PV} ]] ; then
 		emake install DESTDIR="${D}"
 	else
 		emake install DESTDIR="${D}" || die