diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
index 1472e39c83c2..d5c2232dce11 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }:
+{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }:
 
-stdenv.mkDerivation {
-  name = "ksuperkey-git-2015-07-21";
+stdenv.mkDerivation rec {
+  pname = "ksuperkey";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "hanschen";
+    repo = "ksuperkey";
+    rev = "v${version}";
+    sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a";
+  };
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libX11 libXtst xorgproto libXi
-  ];
+  buildInputs = [ libX11 libXtst xorgproto libXi ];
 
-  src = fetchgit {
-    url = "https://github.com/hanschen/ksuperkey";
-    rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639";
-    sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g";
-  };
-
-  preConfigure = ''
-    makeFlags="$makeFlags PREFIX=$out"
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to be able to bind the super key as a key rather than a modifier";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.vozz ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/hanschen/ksuperkey";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.vozz ];
+    platforms = platforms.linux;
   };
 }