diff --git a/dev-db/pgmon/Manifest b/dev-db/pgmon/Manifest
index 9e4223e..dd13df4 100644
--- a/dev-db/pgmon/Manifest
+++ b/dev-db/pgmon/Manifest
@@ -1,4 +1,4 @@
 DIST pgmon-1.0.0.tar.gz 37417 SHA256 0c49f78684d9ed555217c321bc8008e735da0764217f904be39e58a16885dc75 SHA512 954f1d010326d3161070f7a99caedf0cd6946e944777b461c1401000240493faf7a878a42f9a62fd07e8a47e0382f4f57f00c83e022369982f8443a89b298c5c WHIRLPOOL cd3ddd468323c2b1adc58d24216e54e5fe6ecdc9a345b7c82c9f3a585092ba14dc18dce485700af16915f12ac8e7a0dcf703d8f32b545bb70469c6a013f5c18e
 DIST pgmon-1.0.1.tar.bz2 510406 SHA256 5054bcdc95e9dd138bdca897f641b7a613156e616578e22f575160cba8ef1414 SHA512 38ecf378a5a069c758774dc4118b26b3f2eeb1c5a9b58606e75cb56c0ccf54e1a55b76ceafc1adbabc7c06b022b20abdc19a296d03dbee0b3405d3aab3df662a WHIRLPOOL 29290780e6c6f7ce68253752e3c0d8583ff37e79254b35c6481b02c2e91f7e0a5c29464d48182011588eafd9afa1fb51dfac2e35a112ba6c354fdb2f1e8706aa
 EBUILD pgmon-1.0.0.ebuild 1428 SHA256 e571e9f50a40ff37bf1c068521b49d39abee84f83f72a2c6ddb920b8b3fa9259 SHA512 6497cd07f912167c9fedf9569c6972651a2fcbedf354b42f3de5eb0a413e58d86c19c22eee80edea171a4cc9497f0f9ded20f7484a912369ac7580dfe2d00727 WHIRLPOOL 54f4e3675eef379e468a3795e4e9fd8e01048b8a5d94c314d5d40ab90a24f52af39734ce0299d7228acf4d91e2caf97e20ae2965424f65073c801e787410aabb
-EBUILD pgmon-1.0.1.ebuild 1255 SHA256 ab40bf5bde8dee46aba587575e306a839fa9a7f94d532a0d33c749693e862193 SHA512 5ce6a503822396cc6aaac5a53506654a3515c33592617ce7c67a5fecdb1e9232ae8e28749e926e9df55b1506bd6c93a84a39d17baa27eabc586bffcc4d6b420f WHIRLPOOL 1158545d3b7e58f8d377feaf0723d3f2215ae498f60f74ac441880b61d41f0e014264af5d88a407d95712d65d608d7d43b3633a7b728cbad476a31fd8b84079b
+EBUILD pgmon-1.0.1.ebuild 1351 SHA256 d780dd77df643688017ef447bafc7d5f2a49ecbbd0aa13b8b8627fbf7599281e SHA512 602f8048cfb3b95a18698c0b8f38eba6ce38503703af3dd28eff0e382218cb2a2dd2609bfebbb001ff3b11eb04610871db20738dd125443602b0a8af396ad2d3 WHIRLPOOL 2c055371615e64b1d94c9a3fdf0a55e6a62b1bf7639c4a3ada5b1dd93a5736926c6f082de4c01711476a7b16f656f0862a2c723fd18170358209ec05da551f26
diff --git a/dev-db/pgmon/pgmon-1.0.0.ebuild b/dev-db/pgmon/pgmon-1.0.0.ebuild
deleted file mode 100644
index d4ec9fd..0000000
--- a/dev-db/pgmon/pgmon-1.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6..13} )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="PostgreSQL monitoring bridge"
-HOMEPAGE="https://code2.shh-dot-com.org/james/pgmon"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-#SRC_URI="https://code2.shh-dot-com.org/james/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="${P}.tar.gz"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/psycopg:2
-	dev-python/pyyaml
-	app-admin/logrotate
-	"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-IUSE="-systemd"
-
-S="${WORKDIR}/${PN}"
-
-pkg_nofetch() {
-	einfo "Please download"
-	einfo "  - ${P}.tar.bz2"
-	einfo "from ${HOMEPAGE} and place it in your DISTDIR directory."
-	einfo "The file should be owned by portage:portage"
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Don't run make install
-	#default
-
-	# Install init script
-	newinitd "openrc/pgmon.initd" pgmon
-	newconfd "openrc/pgmon.confd" pgmon
-
-	# Install systemd unit
-	if use systemd ; then
-		systemd_dounit "systemd/pgmon.service"
-	fi
-
-	# Install script
-	python_scriptinto /usr/bin
-	python_newscript src/pgmon.py pgmon
-
-	# Install default config
-	diropts -o root -g root -m 0755
-	insinto /etc/pgmon
-	doins "sample-config/pgmon.yml"
-	doins "sample-config/pgmon-metrics.yml"
-
-	# Install logrotate config
-	insinto /etc/logrotate.d
-	newins "logrotate/pgmon.logrotate" pgmon
-
-	# Install man page
-	doman manpages/pgmon.1
-}
diff --git a/dev-db/pgmon/pgmon-1.0.1.ebuild b/dev-db/pgmon/pgmon-1.0.1.ebuild
index b7a34d9..9c52b5a 100644
--- a/dev-db/pgmon/pgmon-1.0.1.ebuild
+++ b/dev-db/pgmon/pgmon-1.0.1.ebuild
@@ -16,6 +16,8 @@ KEYWORDS="amd64"
 
 SRC_URI="https://code2.shh-dot-com.org/james/${PN}/archive/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
+IUSE="-systemd"
+
 DEPEND="
 	${PYTHON_DEPS}
 	dev-python/psycopg:2
@@ -27,7 +29,7 @@ BDEPEND=""
 
 RESTRICT="fetch"
 
-S="${WORKDIR}/${PN}"
+#S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
 	einfo "Please download"
@@ -36,19 +38,25 @@ pkg_nofetch() {
 	einfo "The file should be owned by portage:portage."
 }
 
-src_install() {
-	default
+src_compile() {
+	true
+}
 
+src_install() {
 	# Install init script
-	newinitd "openrc/pgmon.initd" pgmon
-	newconfd "openrc/pgmon.confd" pgmon
+	if ! use systemd ; then
+		newinitd "openrc/pgmon.initd" pgmon
+		newconfd "openrc/pgmon.confd" pgmon
+	fi
 
 	# Install systemd unit
-	systemd_dounit "systemd/pgmon.service"
+	if use systemd ; then
+		systemd_dounit "systemd/pgmon.service"
+	fi
 
 	# Install script
 	exeinto /usr/bin
-	newexe "pgmon.py" pgmon
+	newexe "src/pgmon.py" pgmon
 
 	# Install default config
 	diropts -o root -g root -m 0755