diff --git a/GENTOO/pgmon-1.0.1.ebuild b/GENTOO/pgmon-1.0.1.ebuild
index 86416bd..b7a34d9 100644
--- a/GENTOO/pgmon-1.0.1.ebuild
+++ b/GENTOO/pgmon-1.0.1.ebuild
@@ -14,7 +14,7 @@ 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="https://code2.shh-dot-com.org/james/${PN}/archive/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -31,9 +31,8 @@ S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
 	einfo "Please download"
-	einfo "  - ${P}.tgz"
+	einfo "  - ${P}.tar.bz2"
 	einfo "from ${HOMEPAGE} and place it in your DISTDIR directory."
-	einfo "The file needs to be renamed to ${P}.tar.gz."
 	einfo "The file should be owned by portage:portage."
 }
 
diff --git a/Makefile b/Makefile
index a3818e4..8f98594 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,8 @@ SUPPORTED := ubuntu-20.04 \
 	     debian-11 \
 	     rockylinux-8 \
 	     rockylinux-9 \
-	     oraclelinux-7
+	     oraclelinux-7 \
+	     gentoo
 
 ##
 # These targets are the main ones to use for most things.
@@ -28,6 +29,12 @@ SUPPORTED := ubuntu-20.04 \
 .PHONY: package-all
 all: $(foreach distro_release, $(SUPPORTED), package-$(distro_release))
 
+# Gentoo package (tar.gz) creation
+.PHONY: package-gentoo
+package-gentoo:
+	mkdir -p $(BUILD_DIR)/gentoo
+	tar --transform "s,^\.,$(PACKAGE_NAME)-$(VERSION)," -acjf $(BUILD_DIR)/gentoo/$(PACKAGE_NAME)-$(VERSION).tar.bz2 --exclude $(BUILD_DIR) .
+
 
 # Create a deb package
 .PHONY: package-%
@@ -42,7 +49,6 @@ package-%:
 	    --user $(shell id -u):$(shell id -g) \
 	    "$(DISTRO)-packager:$(RELEASE)"
 
-
 # Create a tarball
 tgz:
 	rm -rf $(BUILD_DIR)/tgz/root