diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index a3d0fa6fc285..257f972e4f47 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   lib,
   fetchFromGitHub,
-  pnpm_9,
+  pnpm,
   nodejs,
   fetchpatch,
   stdenv,
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "apache-answer";
-  version = "1.4.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "apache";
-    repo = "incubator-answer";
+    repo = "answer";
     tag = "v${version}";
-    hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI=";
+    hash = "sha256-OocQsCqyVHjkpGSDS23RbOJ+b10Ax32G2hok5bgNDTI=";
   };
 
   webui = stdenv.mkDerivation {
@@ -25,15 +25,15 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/ui";
 
-    pnpmDeps = pnpm_9.fetchDeps {
+    pnpmDeps = pnpm.fetchDeps {
       inherit src version pname;
       sourceRoot = "${src.name}/ui";
       fetcherVersion = 1;
-      hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
+      hash = "sha256-6IeLOwsEqchCwe0GGj/4v9Q4/Hm16K+ve2X+8QHztQM=";
     };
 
     nativeBuildInputs = [
-      pnpm_9.configHook
+      pnpm.configHook
       nodejs
     ];
 
@@ -55,26 +55,28 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-nvXr1YAqVCyhCgPtABTOtzDH+FCQhN9kSEhxKw7ipsE=";
+  vendorHash = "sha256-jKpUJD8rq+ZvTgJVaI+AfrwMzrrai+cfd4hjoDLYnxc=";
+
+  doCheck = false; # TODO checks are currently broken upstream
+
+  ldflags = [
+    "-X main.Version=${version}"
+    "-X main.Commit=${version}"
+  ];
 
   preBuild = ''
     cp -r ${webui}/* ui/build/
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/apache/incubator-answer/commit/57b0d0e84dd0e0bf3c8a05a38a7f55eddc5f0dda.patch";
-      hash = "sha256-TfF+PtrcMYYgNjgU4lGpnshdII8xECTT2L7M26uebn0=";
-    })
-  ];
-
   meta = {
     homepage = "https://answer.apache.org/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      bot-wxt1221
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "answer";
-    changelog = "https://github.com/apache/incubator-answer/releases/tag/v${version}";
+    changelog = "https://github.com/apache/answer/releases/tag/v${version}";
     description = "Q&A platform software for teams at any scales";
   };
 }