diff --git a/net-misc/q/Manifest b/net-misc/q/Manifest
index afe250d..5380ad9 100644
--- a/net-misc/q/Manifest
+++ b/net-misc/q/Manifest
@@ -1,2 +1,4 @@
 DIST q-0.11.4-deps.tar.xz 42530660 BLAKE2B 0e1022b9fa8c958bbb0348c1dd1ca48a0d6cb838fa4ed0f71daff9f38d1cf6fdb18d6d5a134da1ba885915b035e0d45996bbeb681aff1637ffccc1681acd0eb7 SHA512 217d5dbc3143a51dcc5f5cf593dc8c68ec378316500983ffd3db89dbf5102d4a237002b1f499330b400012b858f5d453aaf39ed667f9118d9c920ae54ff03298
 DIST q-0.11.4.tar.gz 382000 BLAKE2B bbba52703b8dec8f7a43be2312b28134b5f73a060217c5f25ccc52fe29ce13203fa2ec78f709650d2ef9c3532e7c1ef352560ca38cc58eae8187c606780eef69 SHA512 a1b19c1270b1f5e6b1034eea2674cfd38e24581305bff5404f4579b6dcda413feb1159d3954a3eabee4587b919f688fb3cfbd4f1ee3b035f64722c6b481a502a
+DIST q-0.11.4_p20230816-deps.tar.xz 53952600 BLAKE2B 0215dda80ac1a668972a124496c21d87f239640e692c4761b27a4e3931b0a984c5807829ed7c22ce77227754a0c4fef94df74e47b76eb0e06956a068d8942f0e SHA512 d4704d725ebfce495c2ec1fe6faf963f98d5e20d655b816f291e6298cea45d6129f95b72cf4a344dc18fc6546c333cb1b66a86cf816a54ec8d919e81a7ba8b8e
+DIST q-0.11.4_p20230816.tar.gz 383233 BLAKE2B af12aa7fe152e67a7d3924b07cd12322c840a06343f7615f7459455db5bd0055cec077bfb03ae290df7101f87d1f90864d2e003b386fde664330ba5fc9142ebe SHA512 f2b38ee6e055836334c5272eefb2121afef691d05e76c2c2bd1a0f62599de24e95a25ced428fc9b8741f20e74f320153f8f930584b01b3876896fe69dfc23e36
diff --git a/net-misc/q/q-0.11.4_p20230816.ebuild b/net-misc/q/q-0.11.4_p20230816.ebuild
new file mode 100644
index 0000000..284915e
--- /dev/null
+++ b/net-misc/q/q-0.11.4_p20230816.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+EGO_PN="github.com/natesales/q"
+COMMIT_ID="8e9f6cc3f67b711a8e657235f80fc42e2165a70f"
+
+inherit go-module
+
+HOMEPAGE="https://github.com/natesales/q"
+DESCRIPTION="DNS client with support for UDP, TCP, DoT, DoH, DoQ and ODoH"
+
+if [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://${EGO_PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+# Add the manually vendored tarball.
+# 1) Create a tar archive optimized to reproduced by other users or devs.
+# 2) Compress the archive using XZ limiting decompression memory for
+#    pretty constraint systems.
+# Use something like:
+# tar cf $P-deps.tar go-mod \
+#       --mtime="1970-01-01" --sort=name --owner=portage --group=portage
+# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
+SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz"
+
+MY_PN="q-dns"
+KEYWORDS="~amd64"
+LICENSE="AGPL-3 Apache-2.0 BSD BSD-2 GPL-3 MIT"
+
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	export CGO_ENABLED=0
+
+	# Flags -w, -s: Omit debugging information to reduce binary size,
+	# see https://golang.org/cmd/link/.
+	local mygobuildargs=(
+		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID} -s -w"
+		-mod mod -v -work -x
+	)
+	go build  "${mygobuildargs[@]}" . || die "go build failed"
+}
+
+src_install() {
+	newbin "${PN}" "${MY_PN}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSION}" ]]; then
+		elog ""
+		elog "Please note that the binary is renamed to"
+		elog "\"${MY_PN}\" as app-portage/portage-utils"
+		elog "already installs the \"q\" binary."
+		elog "For details see the upstream discussion:"
+		elog "https://github.com/natesales/q/issues/28"
+	fi
+}