diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 973d62467143..94a795d91883 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,15 +1,15 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "libxklavier-3.4";
+  name = "libxklavier-3.9";
 
   src = fetchurl {
-    url = "mirror://sf/gswitchit/${name}.tar.gz";
-    sha256 = "07pq74ygmnr3vgfp86dbjnqsp3v67fww6d3a1vqbif9wzbk70195";
+    url = "mirror://sf/gswitchit/${name}.tar.bz2";
+    sha256 = "462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554";
   };
 
 # TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
+  propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes];
   
   buildInputs = [pkgconfig];
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3469cd86f369..e36008dbf836 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3674,8 +3674,8 @@ let
   };
 
   libxklavier = import ../development/libraries/libxklavier {
-    inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2;
-    inherit (xorg) libX11 libICE libxkbfile;
+    inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2 isocodes;
+    inherit (xorg) libX11 libICE libXi libxkbfile;
     inherit (gtkLibs) glib;
   };