diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 887ccad79d..1ebc75be9e 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,2 +1,2 @@
-DIST gmid-1.7.2.tar.gz 78352 BLAKE2B 8efba7dcdb301f4cc2cf470408e55b7a939bd3cad850e32fa14ba1e752404da7a85a4758ad722ba81f8dd2e45a8a9aad14ec162bdc5947591e9411896bf3c522 SHA512 27cae5699f39afb55b087cbbe7fd134221e786c07664140ace656c483c79213c74abdf82f05de9f1cf09d20a560571f094cf5ad1b1ae2879e3429f3571cec9a5
 DIST gmid-1.7.3.tar.gz 81873 BLAKE2B 66c2b850c4e1a22c50503d9445f257ac045eb69fcc7ca59d72be2c79bab95ea6b3af638b6f8f5518cd92421e10e60d9a7c6a2b3d2c3954c0a3cd911b0d31b1d2 SHA512 9a3acc501c1c0cc6419a18b152345b0ca84418625d8328942f8bba82974655633cbf79d7cdd48ba235915842dd8f8433e84245085bb0b00a4b57e4bda4aa1bd3
+DIST gmid-1.7.4.tar.gz 81988 BLAKE2B 4dc2ec0e89aeb0b2c627927f35a9996f3d91c91b0266f351c6b64f1ba52e0f425cc48add1bdee6f5434f2a486ddd76db8c9e574ac9cbaea3e2a34b16bf0ee9ad SHA512 3dd2cae5597d1b88eec8f2f3b8e60ccc3e2034cbaa30382d982cf0435f1a243643d40c5d00aa7d1c7abae9c9f6751b38f7d6741ec08f7ee280bc2db99263d19e
diff --git a/net-misc/gmid/gmid-1.7.2.ebuild b/net-misc/gmid/gmid-1.7.4.ebuild
similarity index 74%
rename from net-misc/gmid/gmid-1.7.2.ebuild
rename to net-misc/gmid/gmid-1.7.4.ebuild
index 37eb64d65e..10cb49b3a1 100644
--- a/net-misc/gmid/gmid-1.7.2.ebuild
+++ b/net-misc/gmid/gmid-1.7.4.ebuild
@@ -1,34 +1,35 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 SSL_DAYS=36500
 SSL_CERT_MANDATORY=1
-inherit ssl-cert toolchain-funcs
+inherit ssl-cert systemd toolchain-funcs
 
 DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://gmid.omarpolo.com"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
+	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="BSD ISC MIT"
 SLOT="0"
-IUSE="+seccomp test"
+IUSE="seccomp test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	!elibc_Darwin? ( dev-libs/libbsd )
 	acct-user/gemini
 	dev-libs/imsg-compat
-	dev-libs/libbsd
-	dev-libs/libevent
+	dev-libs/libevent:=
 	dev-libs/libretls
+	dev-libs/openssl:=
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -36,7 +37,16 @@ BDEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( README.md ChangeLog )
+DOCS=( README.md ChangeLog contrib/README )
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \
+		-e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \
+		-i contrib/gmid.service || die
+}
 
 src_configure() {
 	local conf_args
@@ -73,6 +83,10 @@ src_install() {
 	insinto /etc/gmid
 	doins "${FILESDIR}"/gmid.conf
 
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	systemd_dounit contrib/gmid.service
 	newinitd "${FILESDIR}"/gmid.initd gmid
 	newconfd "${FILESDIR}"/gmid.confd gmid