diff --git a/app-misc/repositorg/Manifest b/app-misc/repositorg/Manifest
index cd00d39..809182a 100644
--- a/app-misc/repositorg/Manifest
+++ b/app-misc/repositorg/Manifest
@@ -1 +1,2 @@
+DIST repositorg-0.1.1.tar.gz 30370 BLAKE2B ab193c670e022320b120b532f2c4473d9be7ae086e7adff791b44c1b5c46c4dd19b83472523d178a234e1ee727b477c19572a66f3d76e50cc7960fdbdd02e00d SHA512 920115de6bdbfc0e0f041da73bac681fe5282b937550abd908c37b1f64003441ef1687a95dad6a68788b33fb5f69f478b183a5147498f34eb8c6673e4989dcfe
 DIST repositorg-0.1.tar.gz 28654 BLAKE2B 17d435d96fb578801a48f2c60d813bb581c5a381cd2531ed5e19e551fd30ae12b3d1f21556da66772ba3594123b03ad8161e275bc3985647d5c6e1e3455fd692 SHA512 a91d09aa49ba28acdb49516e540a727d875f0850ae578a0b6e6b882a2ca255fec7fde47fcd193d580c2cb7620cab638cb44027b86d7c3f44550aadd13ffa0d38
diff --git a/app-misc/repositorg/repositorg-0.1.1.ebuild b/app-misc/repositorg/repositorg-0.1.1.ebuild
new file mode 100644
index 0000000..3af5347
--- /dev/null
+++ b/app-misc/repositorg/repositorg-0.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=(python3_{8..11})
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically reposit, organize, rename, and process large collections of files."
+HOMEPAGE="https://github.com/TheChymera/repositorg"
+SRC_URI="https://github.com/TheChymera/repositorg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	>=dev-python/argh-0.26.2[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	media-libs/mutagen
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/${PN}_uuid.service" "${PN}_uuid@.service"
+	else
+		newinitd "${FILESDIR}/${PN}_uuid.initd" "${PN}_uuid"
+	fi
+	dobin repositorg_uuid
+}
+
+src_test() {
+	cd test_scripts/
+	for i in *.sh; do
+		./"$i" || die "Test $i failed"
+	done
+}
+
+pkg_postinst() {
+	if use !systemd ; then
+		elog "To be able to run repositorg_uuid as your user (recommended), make a copy of the init script:"
+		elog "	cp /etc/init.d/repositorg_uuid /etc/init.d/repositorg_uuid.<YOUR_USER_NAME>"
+	fi
+}
diff --git a/app-misc/repositorg/repositorg-9999.ebuild b/app-misc/repositorg/repositorg-9999.ebuild
index 92b171c..0b4583f 100644
--- a/app-misc/repositorg/repositorg-9999.ebuild
+++ b/app-misc/repositorg/repositorg-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=(python3_{8..11})
 
 inherit distutils-r1 git-r3 systemd