diff --git a/pkgs/by-name/xa/xannotate/package.nix b/pkgs/by-name/xa/xannotate/package.nix
index 77ede9d55589..fc367100f01b 100644
--- a/pkgs/by-name/xa/xannotate/package.nix
+++ b/pkgs/by-name/xa/xannotate/package.nix
@@ -1,31 +1,20 @@
 {
   lib,
   stdenv,
-  fetchFromBitbucket,
-  fetchpatch,
+  fetchFromGitHub,
   libX11,
 }:
 stdenv.mkDerivation {
   pname = "xannotate";
-  version = "20150301";
+  version = "20150301-unstable-2022-06-04";
 
-  src = fetchFromBitbucket {
+  src = fetchFromGitHub {
     owner = "blais";
     repo = "xannotate";
-    rev = "e5591c2ec67ca39988f1fb2966e94f0f623f9aa7";
-    sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
+    rev = "66821cce888e0067f77470ddac19da1670103d1d";
+    sha256 = "sha256-BDRg29ojBOFfwD4hx3XbcabwrJn2nfgI9Ld27FaQoRw=";
   };
 
-  patches = [
-    # Pull patch pending upstream inclusion for -gno-common tollchains:
-    #   https://github.com/blais/xannotate/pull/1
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/blais/xannotate/commit/ee637e2dee103d0e654865c2202ea1b3af2a20d6.patch";
-      sha256 = "1lw22d5qs1bwp53l332yl3yypfvwrbi750wp7yv90nfn3ia0xhni";
-    })
-  ];
-
   buildInputs = [ libX11 ];
 
   meta = {