diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
deleted file mode 100644
index 39ea3d637fc..00000000000
--- a/pkgs/tools/admin/awscli/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages, groff }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "awscli-${version}";
-  version = "1.9.6";
-  namePrefix = "";
-
-  src = fetchFromGitHub {
-    owner = "aws";
-    repo = "aws-cli";
-    rev = version;
-    sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2";
-  };
-
-  propagatedBuildInputs = [
-    pythonPackages.botocore
-    pythonPackages.bcdoc
-    pythonPackages.six
-    pythonPackages.colorama
-    pythonPackages.docutils
-    pythonPackages.rsa
-    pythonPackages.pyasn1
-    groff
-  ];
-
-  postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
-    mkdir -p $out/share/zsh/site-functions
-    mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
-    rm $out/bin/aws.cmd
-  '';
-
-  meta = {
-    homepage = https://aws.amazon.com/cli/;
-    description = "Unified tool to manage your AWS services";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ muflax ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51510e542d4..008fb0b8e79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -577,7 +577,7 @@ let
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  awscli = callPackage ../tools/admin/awscli { };
+  awscli = pythonPackages.aswcli;
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86b2822e7ea..58239aeb794 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -952,6 +952,44 @@ in modules // {
     };
   }));
 
+  awscli = buildPythonPackage rec {
+    name = "awscli-${version}";
+    version = "1.9.6";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "aws";
+      repo = "aws-cli";
+      rev = version;
+      sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2";
+    };
+
+    propagatedBuildInputs = with self; [
+      botocore
+      bcdoc
+      six
+      colorama
+      docutils
+      rsa
+      pyasn1
+      pkgs.groff
+    ];
+
+    postInstall = ''
+      mkdir -p $out/etc/bash_completion.d
+      echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+      mkdir -p $out/share/zsh/site-functions
+      mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+      rm $out/bin/aws.cmd
+    '';
+
+    meta = {
+      homepage = https://aws.amazon.com/cli/;
+      description = "Unified tool to manage your AWS services";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with maintainers; [ muflax ];
+    };
+  };
+
   azure = buildPythonPackage rec {
     version = "0.11.0";
     name = "azure-${version}";