diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index d009901bbf2e..19a790db77a4 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, autoreconfHook
 , guile
 , pkg-config
 , texinfo
@@ -8,16 +9,17 @@
 
 stdenv.mkDerivation rec {
   pname = "guile-xcb";
-  version = "1.3";
+  version = "unstable-2017-05-29";
 
   src = fetchFromGitHub {
     owner = "mwitmer";
     repo = pname;
-    rev = version;
-    hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs=";
+    rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3";
+    hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config
   ];
   buildInputs = [
@@ -30,6 +32,10 @@ stdenv.mkDerivation rec {
     "--with-guile-site-ccache-dir=$out/share/guile/site"
   ];
 
+  makeFlags = [
+    "GUILE_AUTO_COMPILE=0"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/mwitmer/guile-xcb";
     description = "XCB bindings for Guile";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 373b7c21fcff..e6c37f1715c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18069,7 +18069,7 @@ with pkgs;
   guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb {
-    guile = guile_2_0;
+    guile = guile_2_2;
   };
 
   inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };