diff --git a/net-misc/q/q-0.8.2-r1.ebuild b/net-misc/q/q-0.8.2-r1.ebuild
new file mode 100644
index 0000000..f48a769
--- /dev/null
+++ b/net-misc/q/q-0.8.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+EGO_PN="github.com/natesales/q"
+COMMIT_ID="72fa909c3d5da33ba4ffc96920988a9b5873427f"
+
+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
+		https://files.holgersson.xyz/gentoo/distfiles/${P}-deps.tar.xz
+	"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="
+		https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://files.holgersson.xyz/gentoo/distfiles/${P}-deps.tar.xz
+	"
+fi
+
+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() {
+	# Flags -w, -s: Omit debugging information to reduce binary size,
+	# see https://golang.org/cmd/link/.
+	local mygobuildargs=(
+		-ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT} -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."
+	fi
+}