diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 665681059c..2aaab105fa 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,4 +1,4 @@
-DIST gmid-2.0.1.sha256.sig 239 BLAKE2B b118bd39fc529a05112f405589ce2d1c44d4436b19edecb388709ff2cfe4f49ec15506082da6e8a9aecba7cd9ed2d308aafef5432f1692145d6eabe3b5e53683 SHA512 83eff56ffec7ed55338dfe1e48d670779008c523634c86050a63f333ed328541dcaeb1a0d3fccb01bdf2f6d3bbea20c2898bfbd115ee7590203c04bd24baa064
-DIST gmid-2.0.1.tar.gz 182989 BLAKE2B 4973711ee94babd0b0f470cf84f460343c39867753858817b7262d8ca3947e79b2e20fe004627e8acf00728a3b43db4bfddf446115acca8eadf190dcc6ef533f SHA512 38d29775968c40fe174b8ead3393c3cd77dd535dae18d3051eb9b98b248a56929d84909c07c3405ddc6035e7d1fc66ea856a2a1dd96e53ac8d30fd231c764478
 DIST gmid-2.0.2.sha256.sig 239 BLAKE2B e7f6e6c0f21e10b5bc08b5b72747036ab2b7f1ce820bbf45b3bb4e589d83a6fa1d49e20b95acf3148dcf20608272d48ff2de99ea7fae5b2071a0b7c14539b0cc SHA512 482d8673b140c1a3d0b1a4bc9fd11d74d1bdf968e5d69682c911ff1ea587cfb4e66bafb5817f5286d570f48774d1e13c98939f35afdb69be2f81868dc7560df2
 DIST gmid-2.0.2.tar.gz 182867 BLAKE2B edceadfdccbd2e1c90ec4059062f3fc9feaa0c8d5efede5e51a917604eb7ec7537eff25e1a53223fc0fb13645c7fd3be7e3d4545ea14c7cafc1b0f409c949616 SHA512 dd5ab9b1eb7d1ea82fb935099d05f4e606c9e4e112baf132dad72abe5469b2ade2a4a650c5bad7675ca46601721dd5f0a8ebb91b356af90aed9e11c487fd2f7d
+DIST gmid-2.0.5.sha256.sig 239 BLAKE2B 0f2c2a59fe887dcb04c59e234850b3fd798b377e2e244382d54105af88a9cb08f694168fb227105b2f5e9ea187fb8b39b9d5a7d0dfc46c3343b8c7d5d6354722 SHA512 d18daaa6067b701dacf7c1ed0ebd9e0741b45834db4df2b50bf4d40b41f7c86f741dab0e6951231105f8f6930f6f31c6fd4be2f9ace3f5a08d4ee1f2a6a4f1e5
+DIST gmid-2.0.5.tar.gz 192727 BLAKE2B bfec3f7521fc305973b3ee4d5125ee70b537002236ffbb4e2f18a6aa1ab355d995df970f52108b1266a903aecfc6d97dc96a81872ae4b96851a518cda81f9b44 SHA512 011cdd3fc940b1fd5c88c7496a531e56aba5c4ebf9825b87c3daf7c64dd88e21a7d94556bf5c1a5a34e926e52f13e91e0c8cb60278dfac8ad71fe9197320c022
diff --git a/net-misc/gmid/files/gmid.service-r1 b/net-misc/gmid/files/gmid.service-r1
new file mode 100644
index 0000000000..f406e97706
--- /dev/null
+++ b/net-misc/gmid/files/gmid.service-r1
@@ -0,0 +1,19 @@
+[Unit]
+Description=The gmid Gemini server
+Documentation=https://gmid.omarpolo.com/
+After=network-online.target syslog.target 
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf
+ExecStop=/bin/kill -TERM $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+RestartSec=30
+StandardOutput=journal
+StandardError=inherit
+SyslogIdentifier=gmid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/gmid/gmid-2.0.1-r1.ebuild b/net-misc/gmid/gmid-2.0.5.ebuild
similarity index 92%
rename from net-misc/gmid/gmid-2.0.1-r1.ebuild
rename to net-misc/gmid/gmid-2.0.5.ebuild
index 603af799a8..dc33ba2c33 100644
--- a/net-misc/gmid/gmid-2.0.1-r1.ebuild
+++ b/net-misc/gmid/gmid-2.0.5.ebuild
@@ -15,8 +15,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
-		verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
+	SRC_URI="https://ftp.omarpolo.com/${P}.tar.gz
+		verify-sig? ( https://ftp.omarpolo.com/${P}.sha256.sig )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -91,7 +91,7 @@ src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/vim/*
 
-	systemd_dounit "${FILESDIR}"/gmid.service
+	systemd_newunit "${FILESDIR}"/gmid.service-r1 gmid.service
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid
 
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index 603af799a8..f1e9877d22 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -91,7 +91,7 @@ src_install() {
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/vim/*
 
-	systemd_dounit "${FILESDIR}"/gmid.service
+	systemd_newunit "${FILESDIR}"/gmid.service-r1 gmid.service
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid