diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
new file mode 100644
index 00000000000..cd0cc47d9e7
--- /dev/null
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, fetchPypi, lib,
+  coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "argcomplete";
+  version = "1.8.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+  };
+
+  doCheck = false; # bash-completion test fails with "compgen: command not found".
+
+  # re-enable if we are able to make testing work
+  # buildInputs = [ coverage flake8 ];
+
+  propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ];
+
+  meta = with lib; {
+    description = "Bash tab completion for argparse";
+    homepage = "https://argcomplete.readthedocs.io";
+    maintainers = [ maintainers.womfoo ];
+    license = [ licenses.asl20 ];
+  };
+}
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
new file mode 100644
index 00000000000..b133bc094f9
--- /dev/null
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -0,0 +1,27 @@
+{ python2Packages, lib }:
+
+with python2Packages;
+
+buildPythonApplication rec {
+
+  name = "${pname}-${version}";
+  pname = "cloudmonkey";
+  version = "5.3.3";
+
+  propagatedBuildInputs = [ argcomplete pygments ];
+
+  doCheck = false; # upstream has no tests defined
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7";
+  };
+
+  meta = with lib; {
+    description = "CLI for Apache CloudStack.";
+    homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI";
+    license = [ licenses.asl20 ];
+    maintainers = [ maintainers.womfoo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11e0e16fe47..72e72f130e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -814,6 +814,8 @@ with pkgs;
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
+  cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
+
   clib = callPackage ../tools/package-management/clib { };
 
   colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 107fd715b94..2cea5eaab39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1139,6 +1139,8 @@ in {
     };
   };
 
+  argcomplete = callPackage ../development/python-modules/argcomplete { };
+
   area53 = buildPythonPackage (rec {
     name = "Area53-0.94";