diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index cc08cb5fe5091..327ca8e4ac434 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,5 +3,6 @@ DIST aws-cli-1.38.14.gh.tar.gz 2933092 BLAKE2B d1550d891dc243138e593483ce7306286
 DIST aws-cli-1.38.15.gh.tar.gz 2933057 BLAKE2B 7dbc2d1585ccb4aff946914ce55bf668278c4d305dabe40ea80669cf4eb75999837a10025b8cd35fc3d9405ceffece97ff3277854a28ce66553f4816da6a9b40 SHA512 234ed8a39649569601e060267166e59bc11d27429cd49abb3dcb4545ee212b5a66116243ec802a0b0c2112d8766ad823786b0b93d8899cb7af4d77dadbe17997
 DIST aws-cli-1.38.16.gh.tar.gz 2941536 BLAKE2B 0fd403873f7ae6631f7be3c02117a3e26ec9f4c8b9a460684d4a0c37a1143c3ebbfd36156332152dd7b87dd1c633c137cbecfaaf8b6beb397feb8911545b0eef SHA512 f0260f88f9cd3f6d499cd3e42db7f59bd1a2cd9aa4d25ee73048dd17ca0c9de27fca0a0206ab9b0fc88f8789f3aa2a202c501b633af7b8115cec454138d6fe63
 DIST aws-cli-1.38.17.gh.tar.gz 2941746 BLAKE2B 4ef7d61e2c3d8eeeacaaa1b8ea7f9d1ccd381b7cb9f7be2e7b918abb52e2f546718afbe1f7956f7f97ea0e0738c39e2aefa0ed18188001116f66400ae36c14e2 SHA512 f28061ccde30a98e3732ef654bf98867789c0ed750608b1bc613040be8e3226945213be1296df015f7940e72ad6d1a2339b843e9518d18e02458453869e2d459
+DIST aws-cli-1.38.18.gh.tar.gz 2942596 BLAKE2B 263926ed648f37eca2b1376ad26ac25c5c6d82182c5a3ce0c3511c7b6ba2958db5e6a09c5d4e7fcc702515240b30e4cec952f9f3d47f7d7dcfe5b1078fd3217e SHA512 4cc5eb7e7e1f5c81b7cfe96c09b5996fb8d2148d7b8352a9bbafb9d162fb6b60b58450c7dc0fb717e779928c2d708fa4538cb4e2c6cf6fb33d5e52952d18472f
 DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024
 DIST aws-cli-1.38.9.gh.tar.gz 2921470 BLAKE2B fb6b616095702417335be03a763a4434759c79fa1a31ec7c8c84cb59567461167b0b3c5b80baa950cd0b7298985b298c825f669b82d33ef5bd35adefe947729c SHA512 23fd65c3a0b0c8bb0cd64d52db924cddc8663671c0d80e45c9af1afb2c8558e42eed7a88d3fba2351fa1cf2d0dda1ca1b51a3baaba04b5249bd5d1551059b100
diff --git a/app-admin/awscli/awscli-1.38.18.ebuild b/app-admin/awscli/awscli-1.38.18.ebuild
new file mode 100644
index 0000000000000..88651d723a583
--- /dev/null
+++ b/app-admin/awscli/awscli-1.38.18.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 shell-completion
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+	newzshcomp bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}