diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix
new file mode 100644
index 000000000000..e7f931d59245
--- /dev/null
+++ b/pkgs/tools/networking/q/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "q";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "natesales";
+    repo = "q";
+    rev = "v${version}";
+    sha256 = "sha256-Esg2i8UNT+SuW9+jsnVEOt1ot822CamZ3JoR8ReY0+4=";
+  };
+
+  vendorHash = "sha256-oarXbxROTd7knHr9GKlrPnnS6ehkps2ZYYsUS9cn6ek=";
+
+  doCheck = false; # tries to resolve DNS
+
+  meta = {
+    description = "A tiny and feature-rich command line DNS client with support for UDP, TCP, DoT, DoH, DoQ, and ODoH";
+    homepage = "https://github.com/natesales/q";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.das_j ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78c71be382f8..aad1a92b31e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1282,6 +1282,8 @@ with pkgs;
 
   pferd = callPackage ../tools/misc/pferd {};
 
+  q = callPackage ../tools/networking/q {};
+
   qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { };
 
   quich = callPackage ../tools/misc/quich { } ;