diff --git a/dev-db/pgmon/Manifest b/dev-db/pgmon/Manifest
index 69cffe0..5b7fcee 100644
--- a/dev-db/pgmon/Manifest
+++ b/dev-db/pgmon/Manifest
@@ -3,3 +3,4 @@ AUX pgmon.logrotate 116 SHA256 d7cc697cc640f661ec0019363b8a411e0df62cbe63b97c5fc
 AUX pgmon.openrc 829 SHA256 bbfd3ec3834e0f04539696715c6529099a4329d7dbce8fe045974b220e123f73 SHA512 bfeb3b9417a32019b20e0147eeb7489551da206409c43d14d683685affafafcdee943493bca1d4d3b0d092eb909ac61764e8898798a737b38edacdb72d021fd7 WHIRLPOOL a0825737f9becd8079f784b5bdc5aab8548c5330ddae815404607fbb52c722d08bf32dd50f8c5dca3c6452d6201f45576c4a072960c42ea736a4939ab394edcf
 AUX pgmon_userparameter.conf 90 SHA256 72ac9abc29908206a57b084f029fce6d662633cac5988c1d79a8628687b7a912 SHA512 1dcf74ebca08ddc077ee35212cdc084a14faa717433f9fb5e2a994863cbf6d9ca7be81f8533df9d1afdcea46b7b0afb3c1182f059774fb5704ccebaae446c24b WHIRLPOOL 8d6dc97519d9c62419a65e201e012d823076156b972ed3da193d6d5e5d01e1a2adb8c60910dd954c096fadc5d772707974467270707ceb70aac80eef3723eb90
 EBUILD pgmon-0.0.1.ebuild 1493 SHA256 0f8623c016ea2b15a3343cf83abf022e17652b3bbab78b200afff7857fc3f12e SHA512 ce2f13e66b960481ede10542788129fadc46de3d95d19ff1e4317c381624fcca35d00be8c11d74b55274f86b618754bcff71ae10aecdb39133ef0111bb3aa2cd WHIRLPOOL 5c38382e171d20d84fba360e39b7854e32c5d108564695ce25f537a55702eeff3f5df169b8ffc501f27e82f1c49dfa7328c96bcd93d0a9ddca9110de4b044bd9
+EBUILD pgmon-0.0.2.ebuild 1499 SHA256 4753b7c82f12814843c795110347b74a16e1c9abafd3590be4dad954ad65110e SHA512 25a8309c33d819a099fcbfdc4c6428497f40658dee2db053caaeb437715fd6680df4ac0c0f36b079b69db8561bf8870e28a67e3ecc660fc7abbe547a61b84003 WHIRLPOOL b4069127dd8a303c2926fbeb7fa8f3c1689d03012c1ac3bdbaa7faa1fb76282e9f0115741f2b1cc15d82ff4452188dbac835c202082907ab5712881afe2689e9
diff --git a/dev-db/pgmon/pgmon-0.0.2.ebuild b/dev-db/pgmon/pgmon-0.0.2.ebuild
new file mode 100644
index 0000000..c6f4d80
--- /dev/null
+++ b/dev-db/pgmon/pgmon-0.0.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6..11} )
+
+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="9fd03f5"
+
+IUSE="+agent agent2"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/psycopg:2
+	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.cfg"
+	doins "${S}/pgmon-metrics.cfg"
+
+	# Install Zabbix userparams file
+	if use agent; then
+		insinto /etc/zabbix/zabbix_agent.d
+		newins "${FILESDIR}/pgmon_userparameter.conf" pgmon.conf
+		fperms 0644 /etc/zabbix/zabbix_agent.d/pgmon.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent.d/pgmon.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix/zabbix_agent2.d
+		newins "${S}/pgmon_userparameter.conf" pgmon.conf
+		fperms 0644 /etc/zabbix/zabbix_agent2.d/pgmon.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.d/pgmon.conf
+	fi
+
+	# Install logrotate config
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/pgmon.logrotate" pgmon
+}