diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/reboot.nix
similarity index 60%
rename from pkgs/applications/misc/keepassx/2.0-http.nix
rename to pkgs/applications/misc/keepassx/reboot.nix
index b3a84d36b1ec..f6ed251601a9 100644
--- a/pkgs/applications/misc/keepassx/2.0-http.nix
+++ b/pkgs/applications/misc/keepassx/reboot.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "keepassx2-http-unstable-${version}";
-  version = "2016-05-27";
+  name = "keepassx-reboot-${version}";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
-    owner = "droidmonkey";
-    repo = "keepassx_http";
-    rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
-    sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+    owner = "keepassxreboot";
+    repo = "keepassx";
+    rev = "${version}-http";
+    sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
   };
 
   buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
-    homepage = http://www.keepassx.org/;
+    homepage = https://github.com/keepassxreboot/keepassx;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+    maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1360b765e9fb..11cc0b4e631a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -60,6 +60,7 @@ doNotDisplayTwice rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
+  keepassx2-http = keepassx-reboot; # added 2016-10-17
   keybase-go = keybase;  # added 2016-08-24
   letsencrypt = certbot; # added 2016-05-16
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c228aa0a68ca..e78b69dadc08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12696,7 +12696,7 @@ in
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { };
+  keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;