diff --git a/app-forensics/regripper/Manifest b/app-forensics/regripper/Manifest
index 47e0afc..d35a286 100644
--- a/app-forensics/regripper/Manifest
+++ b/app-forensics/regripper/Manifest
@@ -1,4 +1,2 @@
-AUX plugins_folder.patch 461 RMD160 af1ce92c1fb345d8e9abb250f6116e16189cc288 SHA1 6dac52ae722dafa86dd78c4ebf78800584d03bd5 SHA256 eacc167b36312bd86c741ec1a40d99fcd78814af2987486d0ff18fec6fdda413
-DIST regripperplugins_20111118.zip 241658 RMD160 0cceacbc7bd3e5be086cfc833217f0c2c7eb2a5a SHA1 7b92f75327cdc1a486a3bac1860fd3c8294b9a6f SHA256 f3fd8014f09ecfe26245ac8411532d3ef13ffb805ce6ec030722c7e31f3904ae
-DIST rr_tools.zip 2334802 RMD160 a429aed209ea31417a57fe142c41e71f5c9d066f SHA1 582a0c873781cdf355d25c71bb1583006f28cb33 SHA256 1f849e2b424e94e150792cec9a07eea48f2d7ca6963f13200fc0e3544a7eb72b
-EBUILD regripper-20111118.ebuild 882 RMD160 51eedf6e4a77b1b183b778fe5291164014d7a400 SHA1 eb0e51ccb0b7f5060038b2e1d024a8faf0a30ed1 SHA256 c25cbb16d75eaf02147468ac0d4c8b6ff1b98704350f535148438c5e66727a85
+AUX plugins_folder.patch 377 SHA256 5c2307aba92de5727c3bb07f37318d4fb899b99dbf3f1ae6b980c5c8f5a4f123 SHA512 8e7ad82aeffc96cf195a83f540c5a4af80c56b28f365eefea40380708e571b21d0e78dfb1c7889339d616fa2eac40ab21b13a66dba937eeb0be257e095ce8a57 WHIRLPOOL 4f9e33d29474de5e22d09b97356bcc077a2092bf50fd1b6a74474009bcfad58c178fcf76f05069caec5697fc1fbefd5c97d01cb16a12ae254ae3c8e56a2fd8b1
+EBUILD regripper-9999.ebuild 1038 SHA256 4e1d0ee91dbd463bea8a35032741bc44fad20253ae5dfa2a8c0dabb63d9829a6 SHA512 6c8140d6033f0e66e4e09942911d6de9ae51c9a33193fc13a66e5494719dd1ec00f9fed432e3f9db6473a26bc077ae073c1d571bbdcc9efe880020149b9f2943 WHIRLPOOL 0d405c29165e8ee8c6b4b5664ede879958e8383616c3ee91ae4df314dba00d8c1bb0bdf87cead5c21993479b8a88271dead17caee9d2bbe957e28860c69dade3
diff --git a/app-forensics/regripper/files/plugins_folder.patch b/app-forensics/regripper/files/plugins_folder.patch
index db27a76..e0d2d4b 100644
--- a/app-forensics/regripper/files/plugins_folder.patch
+++ b/app-forensics/regripper/files/plugins_folder.patch
@@ -1,17 +1,12 @@
---- rip.pl.orig	2011-12-26 13:54:37.866629587 -0800
-+++ rip.pl	2011-12-26 13:55:10.854628885 -0800
-@@ -40,6 +40,7 @@
-                    : (@path = split(/\//,$0));
- $str =~ s/($path[scalar(@path) - 1])//;
- my $plugindir = $str."plugins/";
-+$plugindir = "/usr/share/regripper/";
+--- rip.pl
++++ rip.pl
+@@ -60,7 +60,8 @@ $str =~ s/($path[scalar(@path) - 1])//;
+ #push(@INC,$str);
+ 
+ #my $plugindir = $str."plugins/";
+-my $plugindir = File::Spec->catfile("plugins");
++#my $plugindir = File::Spec->catfile("plugins");
++my $plugindir = "/usr/share/regripper/plugins";
  #print "Plugins Dir = ".$plugindir."\n";
  # End code update
- my $VERSION = "20090102";
-@@ -289,4 +290,4 @@
- 	};
- 	$t = 0 if ($t < 0);
- 	return $t;
--}
-\ No newline at end of file
-+}
+ my $VERSION = "2\.8_20130801";
diff --git a/app-forensics/regripper/regripper-20111118.ebuild b/app-forensics/regripper/regripper-20111118.ebuild
deleted file mode 100644
index 0275653..0000000
--- a/app-forensics/regripper/regripper-20111118.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Perl scripts to parse Windows registry files"
-HOMEPAGE="http://regripper.wordpress.com/program-files/"
-SRC_URI="http://winforensicaanalysis.googlecode.com/files/rr_tools.zip
-         http://regripperplugins.googlecode.com/files/regripperplugins_${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/dos2unix"
-RDEPEND="perl-gcpan/Parse-Win32Registry"
-
-S="${WORKDIR}/${P/_/}"
-
-
-src_prepare() {
-    rm -rf plugins *.exe rr.pl *.dll
-}
-
-src_compile() {
-    dos2unix *.pl
-    epatch "${FILESDIR}"/plugins_folder.patch
-
-    sed -i 's|c:\\perl\\bin\\perl.exe|/usr/bin/perl -w|g' rip.pl || die
-}
-
-src_install () {
-    newbin rip.pl ${PN}
-    rm rip.pl
-
-    insinto /usr/share/"${PN}"
-    doins *.pl
-}
diff --git a/app-forensics/regripper/regripper-9999.ebuild b/app-forensics/regripper/regripper-9999.ebuild
new file mode 100644
index 0000000..c40ba10
--- /dev/null
+++ b/app-forensics/regripper/regripper-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Perl scripts to parse Windows registry files"
+HOMEPAGE="https://github.com/keydet89/RegRipper2.8"
+
+if [[ ${PV} = 9999 ]]; then
+    EGIT_REPO_URI="https://github.com/keydet89/RegRipper2.8.git"
+    inherit git-2
+    KEYWORDS=""
+else
+    SRC_URI="https://regripper.googlecode.com/files/rrv${PV}.zip"
+    KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-text/dos2unix"
+RDEPEND="dev-perl/Parse-Win32Registry"
+
+S="${WORKDIR}/${P/_/}"
+
+
+src_prepare() {
+    rm *.exe rr.pl *.dll
+}
+
+src_compile() {
+	if [[ ${PV} = 9999 ]]; then
+		epatch "${FILESDIR}"/plugins_folder.patch
+    	dos2unix plugins/*.pl
+	fi
+
+    dos2unix *.pl
+
+    sed -i 's|c:\\perl\\bin\\perl.exe|/usr/bin/perl -w|g' rip.pl || die
+}
+
+src_install () {
+    newbin rip.pl ${PN}
+    rm rip.pl
+
+	if [[ ${PV} = 9999 ]]; then
+    	insinto /usr/share/"${PN}"
+    	doins -r plugins
+	fi
+
+	dodoc regripper.pdf
+}