diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
index 9eafb5e6b497..fe6d5cae6ee1 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchFromBitbucket, libX11}:
+{lib, stdenv, fetchFromBitbucket, fetchpatch, libX11}:
 stdenv.mkDerivation rec {
   pname = "xannotate";
   version = "20150301";
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
   };
 
+  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 = {
@@ -17,6 +27,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus ;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
-    homepage = "https://bitbucket.org/blais/xannotate";
+    homepage = "https://github.com/blais/xannotate";
   };
 }