diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 9587f30f75715..d0be594145553 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1 +1,2 @@
 DIST tinyssh-20250411.tar.gz 421627 BLAKE2B 36664a06815201a342891fdfaa4adf4d9225ca2254702a1a8f3d5e7c13ab78a28889cbf575241007a737e05b3758e8b67c6202e6f3f5db96b9e031cee626a622 SHA512 849fa29757b8f2967cabd1a86e36a2e89c512f1d4495e084e63d1245f6294d21612f792f7dc6924bad301338959219638bf1caa3cc35d4b8135fa1f764440b60
+DIST tinyssh-20250501.tar.gz 421567 BLAKE2B acffcb249e09686fcc9364bdc617f9bbb27c98c1e4c25ed7859711cb9b25be35eff29d8afcd372eab884ec307f2c8ae51596e5782a237ae97b20fbb7e9010f44 SHA512 c303bfa1781d668a86ca05d5c5fe2b028e4b99ba864700283c5bff1bec1050d95ed2b942e8d0eb1bd62fd6e06dc0ad0c404e83e589a67f6e6997b500b857d805
diff --git a/net-misc/tinyssh/tinyssh-20250501.ebuild b/net-misc/tinyssh/tinyssh-20250501.ebuild
new file mode 100644
index 0000000000000..3ff059060c0b7
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20250501.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A small SSH server with state-of-the-art cryptography"
+HOMEPAGE="https://tinyssh.org"
+if [[ "${PV}" == "99999999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"
+else
+	SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( CC0-1.0 0BSD MIT-0 MIT )"
+SLOT="0"
+
+RDEPEND="
+	${DEPEND}
+	sys-apps/ucspi-tcp
+"
+
+src_prepare() {
+	default
+
+	echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	emake gentoo-autoheaders
+
+	local i
+	for i in has*.log
+	do
+		einfo "$i"
+		cat "$i"
+	done
+}
+
+src_install() {
+	einstalldocs
+	emake install DESTDIR="${D}" PREFIX=/usr
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
+	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
+	systemd_dounit "${FILESDIR}/${PN}-makekey.service"
+}
+
+pkg_postinst() {
+	einfo "TinySSH is in beta stage, and ready for production use."
+	einfo "See https://tinyssh.org for more information."
+}
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index a4aed4b70c610..3ff059060c0b7 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="CC0-1.0"
+LICENSE="|| ( CC0-1.0 0BSD MIT-0 MIT )"
 SLOT="0"
 
 RDEPEND="