diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 1ebf37a0f2bc..5df49b76bc67 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1 +1,2 @@
 DIST s3fs-1.95.tar.gz 285599 BLAKE2B 4cb34f50d4efd0c1e0ef8196c3c9a53c380338317b736dbc229ef37ef22cec9dcf634a5b253bcdd23b25f16badffe39817c8c59530a49963cde17a2721a7b678 SHA512 73fd33895ace0e60fe8df392d474624f913a310c8df136bcc60b7d644ce7a92681ac7ced9bf9fcb9ef248f48b3bee3d4e871c172368c0b07626cb8f2ed3ba1b9
+DIST s3fs-1.96.tar.gz 307254 BLAKE2B 960be8000d531e4aeee2ba10d9f451d41f14a6e272cdf25361beeb27d85e9734e6fc41145067842f21f465fb7affb3bcc80ed89833cf518853457b80151ae2e3 SHA512 1ad5a99e6bb86e04e95d4de6a56d460766b6f8aaec22b1d06685eee4344decfd0b14ecf37bbc6e8511a1863a21586465401c72112eca2589a80c16c0f4bb0f1d
diff --git a/net-fs/s3fs/s3fs-1.96.ebuild b/net-fs/s3fs/s3fs-1.96.ebuild
new file mode 100644
index 000000000000..a76c16380457
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.96.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN}-fuse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Amazon S3 mounting via fuse"
+HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gnutls nettle nss"
+REQUIRED_USE="nettle? ( gnutls !nss )"
+
+# Requires active internet connection and it tries to download some binaries for later execution
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libxml2:2=
+	net-misc/curl
+	sys-fs/fuse:3=
+	nss? ( dev-libs/nss )
+	!nss? (
+		gnutls? (
+			net-libs/gnutls:=
+			nettle? ( dev-libs/nettle:= )
+		)
+		!gnutls? ( dev-libs/openssl:0= )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	app-misc/mime-types
+"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i 's/ -D_FORTIFY_SOURCE=3//' configure.ac || die #895676
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with nettle)
+	)
+	if use nss; then
+		myeconfargs+=( $(use_with nss) )
+	elif use gnutls; then
+		myeconfargs+=( $(use_with gnutls) )
+	else
+		myeconfargs+=( --with-openssl )
+	fi
+
+	econf "${myeconfargs[@]}"
+}