diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix
new file mode 100644
index 000000000000..013d7a75259f
--- /dev/null
+++ b/pkgs/by-name/dn/dnsdiag/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "dnsdiag";
+  version = "2.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "farrokhi";
+    repo = "dnsdiag";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qUbHwbLPDyy24GNu3dDJQKV3B71q1ODNMyRFIWwyRuo=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    cryptography
+    cymruwhois
+    dnspython
+    h2
+    httpx
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  meta = {
+    description = "DNS Measurement, Troubleshooting and Security Auditing Toolset";
+    homepage = "https://github.com/farrokhi/dnsdiag";
+    changelog = "https://github.com/farrokhi/dnsdiag/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "dnsdiag";
+  };
+}