diff --git a/GENTOO/pgmon-0.1.0.ebuild b/GENTOO/pgmon-0.1.0.ebuild
deleted file mode 100644
index eed7462..0000000
--- a/GENTOO/pgmon-0.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6..12} )
-
-inherit git-r3 python-r1
-
-DESCRIPTION="PostgreSQL monitoring bridge"
-HOMEPAGE="None"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-EGIT_REPO_URI="https://code2.shh-dot-com.org/james/pgmon.git"
-#EGIT_COMMIT=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/psycopg:3
-	dev-python/pyyaml
-	acct-user/zabbix
-	acct-group/zabbix
-	agent? ( net-analyzer/zabbix[agent] )
-	agent2? ( net-analyzer/zabbix[agent2] )
-	app-admin/logrotate
-	"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	default
-
-	# Install init script
-	newinitd "${FILESDIR}/pgmon.openrc" pgmon
-
-	# Install script
-	exeinto /usr/bin
-	newexe "${S}/pgmon.py" pgmon
-
-	# Install default config
-	diropts -o root -g zabbix -m 0755
-	insinto /etc/pgmon
-	doins "${FILESDIR}/pgmon.yml"
-	doins "${S}/pgmon-metrics.yml"
-
-	# Install logrotate config
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/pgmon.logrotate" pgmon
-}
diff --git a/GENTOO/pgmon-1.0.0.ebuild b/GENTOO/pgmon-1.0.0.ebuild
deleted file mode 100644
index 860e65f..0000000
--- a/GENTOO/pgmon-1.0.0.ebuild
+++ /dev/null
@@ -1,56 +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 git-r3 python-r1
-
-DESCRIPTION="PostgreSQL monitoring bridge"
-HOMEPAGE="None"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-SRC_URI="https://code2.shh-dot-com.org/james/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/psycopg:2
-	dev-python/pyyaml
-	app-admin/logrotate
-	"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	default
-
-	# Install init script
-	newinitd "openrc/pgmon.initd" pgmon
-	newconfd "openrc/pgmon.confd" pgmon
-
-	# Install systemd unit
-	systemd_dounit "systemd/pgmon.service"
-
-	# Install script
-	exeinto /usr/bin
-	newexe "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/GENTOO/pgmon-1.0.1.ebuild b/GENTOO/pgmon-1.0.1.ebuild
index b7a34d9..9c52b5a 100644
--- a/GENTOO/pgmon-1.0.1.ebuild
+++ b/GENTOO/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