diff --git a/pkgs/servers/dns/acme-dns/default.nix b/pkgs/servers/dns/acme-dns/default.nix
index 6359b9dac221..bb840e282707 100644
--- a/pkgs/servers/dns/acme-dns/default.nix
+++ b/pkgs/servers/dns/acme-dns/default.nix
@@ -3,20 +3,30 @@
   buildGoModule,
   fetchFromGitHub,
   nixosTests,
+  stdenv,
 }:
 
 buildGoModule rec {
   pname = "acme-dns";
-  version = "1.0";
+  # Unstable version to allow building with toolchains later than EOL Go 1.22,
+  # see https://github.com/joohoi/acme-dns/issues/365
+  version = "1.1-unstable-2024-12-15";
 
   src = fetchFromGitHub {
     owner = "joohoi";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-qQwvhouqzkChWeu65epgoeMNqZyAD18T+xqEMgdMbhA=";
+    repo = "acme-dns";
+    rev = "b7a0a8a7bcef39f6158dd596fe716594a170d362";
+    hash = "sha256-UApFNcU6a6nzpwbIJv1LLmXVTGLzY0HQBlRATq2s9x8=";
   };
 
-  vendorHash = "sha256-q/P+cH2OihvPxPj2XWeLsTBHzQQABp0zjnof+Ys/qKo=";
+  # Fetching of goModules fails with 'go: updates to go.mod needed'
+  postPatch = ''
+    substituteInPlace go.mod \
+      --replace-fail 'go 1.22' 'go 1.22.0' \
+      --replace-fail 'toolchain go1.22.0' 'toolchain go1.24.1'
+  '';
+
+  vendorHash = "sha256-pKEOmMF1lvm/CU1n3ykh6YvtRNH/2i+0AvOJzq8eets=";
 
   postInstall = ''
     install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
@@ -32,5 +42,7 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilylange ];
     mainProgram = "acme-dns";
+    # Tests time out on darwin.
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97a319d1245f..d2396c7ac802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1031,9 +1031,7 @@ with pkgs;
   _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { };
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
-  acme-dns = callPackage ../servers/dns/acme-dns/default.nix {
-    buildGoModule = buildGo122Module; # https://github.com/joohoi/acme-dns/issues/365
-  };
+  acme-dns = callPackage ../servers/dns/acme-dns/default.nix { };
 
   acquire = with python3Packages; toPythonApplication acquire;