diff --git a/app-misc/repositorg/files/repositorg_uuid.service b/app-misc/repositorg/files/repositorg_uuid.service
new file mode 100644
index 0000000..a1a057a
--- /dev/null
+++ b/app-misc/repositorg/files/repositorg_uuid.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A repositorg service to check for UUID events
+After=local-fs.target
+ 
+[Service]
+ExecStart=/usr/bin/repositorg_uuid
+User=%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/repositorg/repositorg-9999.ebuild b/app-misc/repositorg/repositorg-9999.ebuild
index 6252f70..d687925 100644
--- a/app-misc/repositorg/repositorg-9999.ebuild
+++ b/app-misc/repositorg/repositorg-9999.ebuild
@@ -1,21 +1,37 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=(python2_7 python3_{4,5,6})
 
-inherit distutils-r1 git-r3 multilib
+inherit distutils-r1 git-r3 systemd
 
-DESCRIPTION="Organize and rename large numbers of files"
+DESCRIPTION="Automatically reposit, organize, rename, and process large collections of files."
 HOMEPAGE="https://github.com/TheChymera/repositorg"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/TheChymera/repositorg"
 
-LICENSE="GPL-3"
+LICENSE="GPLv3"
 SLOT="0"
-IUSE=""
 KEYWORDS=""
+IUSE=""
 
-DEPEND=""
+DEPEND="
+	>=dev-python/argh-0.26.2
+	media-libs/mutagen
+"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	systemd_newunit "${FILESDIR}/${PN}_uuid.service" "${PN}_uuid@.service"
+	dobin repositorg_uuid
+}
+
+src_test() {
+	cd test_scripts/
+	for i in *.sh; do
+		./"$i" || die "Test $i failed"
+	done
+}