diff --git a/app-forensics/bulk_extractor/Manifest b/app-forensics/bulk_extractor/Manifest
index b13599633..1286a95ef 100644
--- a/app-forensics/bulk_extractor/Manifest
+++ b/app-forensics/bulk_extractor/Manifest
@@ -1 +1,2 @@
 DIST bulk_extractor-2.0.3.tar.gz 8456967 BLAKE2B b8184c24dfc1ba9004f44f19a118cb84a9938f1aaf60663fe0bb259045ca4fe86ab339f8a265a71463fdc7e09b7a2f42989990c863f0888f5a2b4f80bd791677 SHA512 e1554f7f9863122ccd7405a5ec713fb3a09eed8e45db4c0c9580e8e914f1a477664683109c2b05e80a5dab169db8aa12ec8d0a49d8a959dc4ab622c11e0612f5
+DIST bulk_extractor-2.0.6.tar.gz 8449867 BLAKE2B 0c7300eca0b2e59e17cea87fd27dedd7a8a7e4ecb807d22a85433bbaf18b8f36cde4831f58d48d56fef0c72b23ab2d1ec833dff1e0c2645b186ab4f19ff04b65 SHA512 911917ced83e35b81c52af8e37f3dba24c6c0a14172e8e997a6e068a58069287f3881add78a3fa363bb3e4ddd9297dfd082fcc74b772d692ec32bed404eab1c2
diff --git a/app-forensics/bulk_extractor/bulk_extractor-2.0.6.ebuild b/app-forensics/bulk_extractor/bulk_extractor-2.0.6.ebuild
new file mode 100644
index 000000000..dc5e94efa
--- /dev/null
+++ b/app-forensics/bulk_extractor/bulk_extractor-2.0.6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Scans a disk image for regular expressions and other content"
+HOMEPAGE="https://github.com/simsong/bulk_extractor"
+SRC_URI="https://github.com/simsong/bulk_extractor/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+#fails to compile with ewf
+#fails to compile with exiv2
+#fails to compile without rar
+IUSE="aff doc beviewer exiv2 hashdb +rar"
+
+#	ewf? ( app-forensics/libewf )
+RDEPEND="
+	aff? ( app-forensics/afflib )
+	dev-libs/expat
+	dev-libs/libgcrypt:=
+	exiv2? ( media-gfx/exiv2 )
+	sys-libs/zlib
+	hashdb? ( dev-libs/hashdb )
+	beviewer? (
+		|| ( virtual/jre:* virtual/jdk:* )
+	)"
+
+DEPEND="${RDEPEND}
+	dev-db/sqlite:3
+	dev-libs/boost
+	dev-libs/openssl:0=
+	dev-libs/libxml2
+	doc? ( app-doc/doxygen )
+	virtual/man"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+src_prepare() {
+#	eapply "${FILESDIR}/bulk_extractor-2.0.3_uint32_t.patch"
+
+	eautoreconf
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-o3 \
+		--disable-libewf
+#		$(use ewf || echo "--disable-libewf")
+#		$(use beviewer || echo "--disable-BEViewer") \
+#		$(use exiv2 && echo "--enable-exiv2") \
+#		$(use aff || echo "--disable-afflib") \
+#		$(use hashdb || echo "--disable-hashdb") \
+#		$(use rar || echo "--disable-rar" )
+}
+
+src_install() {
+	dobin src/${PN}
+	doman man/*.1
+	dodoc AUTHORS ChangeLog NEWS README.md
+
+	if use doc ; then
+		pushd doc/doxygen >/dev/null || die
+		doxygen || die "doxygen failed"
+		popd >/dev/null || die
+
+		dodoc -r \
+			doc/doxygen/html \
+			doc/Diagnostics_Notes \
+			doc/announce \
+			doc/*.{pdf,txt,md} \
+			doc/programmer_manual/*.pdf
+	fi
+
+#	if use beviewer; then
+#		local bev_dir="/opt/beviewer-${PV}"
+
+#		insinto "${bev_dir}"
+#		doins java_gui/BEViewer.jar
+
+#		insinto /usr/share/pixmaps
+#		newins java_gui/icons/24/run-build-install.png ${PN}.png
+
+#		make_wrapper "beviewer" \
+#			"/usr/bin/java -Xmx1g -jar \"${bev_dir}/BEViewer.jar\""
+#		make_desktop_entry \
+#			"beviewer" \
+#			"BEViewer (bulk_extractor)" \
+#			"${PN}" "Utility"
+#	fi
+}
+
+#pkg_postinst() {
+#	if use beviewer; then
+#		xdg_icon_cache_update
+#		xdg_desktop_database_update
+#	fi
+#}
+
+#pkg_postrm() {
+#	if use beviewer; then
+#		xdg_icon_cache_update
+#		xdg_desktop_database_update
+#	fi
+#}
diff --git a/app-forensics/bulk_extractor/metadata.xml b/app-forensics/bulk_extractor/metadata.xml
index 4cd9358a1..52e3cc67e 100644
--- a/app-forensics/bulk_extractor/metadata.xml
+++ b/app-forensics/bulk_extractor/metadata.xml
@@ -17,4 +17,7 @@
 		<flag name="hashdb">Enable the hashdb scanner</flag>
 		<flag name="rar">Enable RAR decompression</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">simsong/bulk_extractor</remote-id> 
+	</upstream>
 </pkgmetadata>