diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index aa98a2795097..feb3bd95372a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -82,6 +82,7 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
+  j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jgeerds = "Jascha Geerds <jg@ekby.de>";
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
new file mode 100644
index 000000000000..fb606273c264
--- /dev/null
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+  version = "2.7";
+  name = "kpcli-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kpcli/${name}.pl";
+    sha256 = "6bb1f7320b4474d6dbb73915393e5df96862f27c6228aa042a810fef46e2b777";
+  };
+
+  buildInputs = [ makeWrapper perl ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${src} $out/bin/kpcli
+    chmod +x $out/bin/kpcli
+
+    wrapProgram $out/bin/kpcli --set PERL5LIB \
+      "${with perlPackages; stdenv.lib.makePerlPath [
+         Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu
+      ]}"
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "KeePass Command Line Interface";
+    longDescription = ''
+      KeePass Command Line Interface (CLI) / interactive shell. 
+      Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line.
+    '';
+    license = licenses.artistic1;
+    homepage = "http://kpcli.sourceforge.net";
+    platforms = platforms.all;
+    maintainers = [ maintainers.j-keck ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fe6b9f53fe5..46d25c7bd60c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1597,6 +1597,8 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
+  kpcli = callPackage ../tools/security/kpcli { };
+
   kst = callPackage ../tools/graphics/kst { };
 
   less = callPackage ../tools/misc/less { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f10fd485842a..e11def2d3b97 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3742,6 +3742,15 @@ let self = _self // overrides; _self = with self; {
     preCheck = "export HOME=$TMPDIR";
   };
 
+  FileKeePass = buildPerlPackage rec {
+    name = "File-KeePass-2.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
+      sha256 = "c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7";
+    };
+    propagatedBuildInputs = [ CryptRijndael ];
+  };
+
   FileListing = buildPerlPackage rec {
     name = "File-Listing-6.04";
     src = fetchurl {
@@ -8128,6 +8137,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SortNaturally = buildPerlPackage rec {
+    name = "Sort-Naturally-1.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
+      sha256 = "eaab1c5c87575a7826089304ab1f8ffa7f18e6cd8b3937623e998e865ec1e746";
+    };
+  };
 
   Starman = buildPerlModule {
     name = "Starman-0.4010";
@@ -8833,6 +8849,14 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  TermShellUI = buildPerlPackage rec {
+    name = "Term-ShellUI-0.92";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BR/BRONSON/${name}.tar.gz";
+      sha256 = "3279c01c76227335eeff09032a40f4b02b285151b3576c04cacd15be05942bdb";
+    };
+  };
+
   TermSizeAny = buildPerlPackage {
     name = "Term-Size-Any-0.002";
     src = fetchurl {