diff --git a/Tools/awscli/build b/Tools/awscli/build
new file mode 100755
index 0000000..35c5125
--- /dev/null
+++ b/Tools/awscli/build
@@ -0,0 +1,12 @@
+#!/usr/bin/env modbuild
+
+pbuild::install() {
+	unzip "${PMODULES_DISTFILESDIR}/awscliv2.zip"
+	./aws/install -i $PREFIX -b ${PREFIX}/bin --update
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/awscli/files/config.yaml b/Tools/awscli/files/config.yaml
new file mode 100644
index 0000000..2759c63
--- /dev/null
+++ b/Tools/awscli/files/config.yaml
@@ -0,0 +1,27 @@
+---
+format: 1
+awscli:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    systems: [.*]
+    build_functions:
+      configure: []
+      compile: []
+  shasums:
+  versions:
+    2.27.22:
+      config:
+        relstage: stable
+        urls:
+          - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
+            name: $P-${V_PKG}.zip
+            unpacker: none
+    2.9.21:
+      config:
+        relstage: deprecated
+        urls:
+          - url: https://awscli.amazonaws.com/$P-exe-linux-x86_64-$V.zip
+            name: $P-${V_PKG}.zip
+            unpacker: none
diff --git a/Tools/awscli/modulefile b/Tools/awscli/modulefile
new file mode 100644
index 0000000..aa96a06
--- /dev/null
+++ b/Tools/awscli/modulefile
@@ -0,0 +1,12 @@
+#%Pmodule
+
+module-whatis       "Universal Command Line Interface for Amazon Web Services"
+module-url          "https://github.com/aws/aws-cli/tree/v2"
+module-license      "https://github.com/aws/aws-cli/blob/v2/LICENSE.txt"
+module-maintainer   "Krisztian Pozsa <krisztian.pozsa@psi.ch>"
+
+module-help         "
+The AWS Command Line Interface (AWS CLI) is a unified tool to manage your
+AWS services. With just one tool to download and configure, you can control
+multiple AWS services from the command line and automate them through scripts.
+"