diff --git a/net-analyzer/smbmap/Manifest b/net-analyzer/smbmap/Manifest
index 2cd66bf86..1bd8ac5da 100644
--- a/net-analyzer/smbmap/Manifest
+++ b/net-analyzer/smbmap/Manifest
@@ -1 +1 @@
-DIST smbmap-1.8.2.tar.gz 32811 BLAKE2B fd0cd82f027faa562ee1cb4da101cab97e0d8b398b712815c1cf47c85c88874831acbfcef2e8f75dbbc89f6c69f85be6c46bfe1069d3d030171b55f52bb1b3fa SHA512 e2f2f4bd76178d02a0cd0822e36a04e4f87f6b00d4ff461e0a5e14d54d3652f95fe2415d1e8b7678873b4aac108c8372f0fff9848344f742ef1ca88b0f0792b8
+DIST smbmap-1.10.2.tar.gz 40086 BLAKE2B 98a9f628bed9eb4aa403d71cfbdca9edda9749f8c3a5d4b38cdb59260e93fc6fbd52c49ffb430a6cf00d783d0b7dfba857efc67b4c8a0c24bbcb64e977f63ed7 SHA512 91765af7389790e513d5fbf8ed5c86d0eb61dbb0b5d83e7fdf3ac5c9315cd680fa1aab3d7df785877ed94f0ce05d465534544d6c8ecb7a7bff33b39ef2f395b9
diff --git a/net-analyzer/smbmap/metadata.xml b/net-analyzer/smbmap/metadata.xml
index 1dbf520b5..eb4af6372 100644
--- a/net-analyzer/smbmap/metadata.xml
+++ b/net-analyzer/smbmap/metadata.xml
@@ -5,4 +5,8 @@
 		<email>gkroon@maelstrom.ninja</email>
 		<name>Guido Kroon</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ShawnDEvans/smbmap</remote-id>
+		<remote-id type="pypi">smbmap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/smbmap/smbmap-1.10.2.ebuild b/net-analyzer/smbmap/smbmap-1.10.2.ebuild
new file mode 100644
index 000000000..cab81799b
--- /dev/null
+++ b/net-analyzer/smbmap/smbmap-1.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="SMBMap is a handy SMB enumeration tool"
+HOMEPAGE="https://github.com/ShawnDEvans/smbmap"
+
+KEYWORDS="amd64 ~arm64 x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/impacket[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/net-analyzer/smbmap/smbmap-1.8.2-r1.ebuild b/net-analyzer/smbmap/smbmap-1.8.2-r1.ebuild
deleted file mode 100644
index d1fc133d2..000000000
--- a/net-analyzer/smbmap/smbmap-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: add py3.* support
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-r1
-
-DESCRIPTION="SMBMap is a handy SMB enumeration tool"
-HOMEPAGE="https://github.com/ShawnDEvans/smbmap"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ShawnDEvans/smbmap"
-else
-	SRC_URI="https://github.com/ShawnDEvans/smbmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/impacket[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_install() {
-	python_foreach_impl python_newscript ${PN}.py ${PN}
-}