diff --git a/dev-util/soapui/Manifest b/dev-util/soapui-bin/Manifest
similarity index 50%
rename from dev-util/soapui/Manifest
rename to dev-util/soapui-bin/Manifest
index 37c944c2a..11ff494e2 100644
--- a/dev-util/soapui/Manifest
+++ b/dev-util/soapui-bin/Manifest
@@ -1,2 +1,2 @@
-DIST SoapUI-5.7.0-linux-bin.tar.gz 125428112 BLAKE2B a9a4546ab27f2f5cdf6f747820b11352198244072c699ebbf495521af7fff6aa7c4d50ebbf004d80a829314c9a7c85156d26e564b72204ab4954d6fc6a0d25a5 SHA512 19438f440023e16b047177350a10427d6ad9bd7b0cbba850355ad56d3e5ee7855dbebc06bd0a7705076db688000ce6e1845c9b27f374fccc11c6c9f9fea5424b
 DIST SoapUI-5.7.2-linux-bin.tar.gz 124950715 BLAKE2B ee5700cbf6b74b16f8aa909adf489bc5449fccf9e624eb2777f829e6997f641179c20e67d7640ff43e1b3a0d0737195412c90eff3c1377686ba8df85796276a5 SHA512 0e8e05c66777bd03d9b49d5ff3725aa0418d3eb004f70d109aea08dafe759e39094dbcfffbc838b2e26aa9ed59672d5edb71a95505862890dc81054aa7ae4353
+DIST SoapUI-5.8.0-linux-bin.tar.gz 135917454 BLAKE2B d67bb7ca1fd33808e09d20eaad5c153dc6612eeee032fe244006aaa0413fb808a619045fac4f220e13181be2e340ca57a200da652cae6ecc25f2e95203e9ad80 SHA512 0e8e098a516b352da9205306373c2a88d1784f227ba8363b9e407102c8bfa3e7ffb5a97a9c2a3c575d97425ce6fc223ad7e9b363e81e4e4f33d4451d2a83bc0e
diff --git a/dev-util/soapui/metadata.xml b/dev-util/soapui-bin/metadata.xml
similarity index 100%
rename from dev-util/soapui/metadata.xml
rename to dev-util/soapui-bin/metadata.xml
diff --git a/dev-util/soapui/soapui-5.7.2.ebuild b/dev-util/soapui-bin/soapui-bin-5.7.2.ebuild
similarity index 94%
rename from dev-util/soapui/soapui-5.7.2.ebuild
rename to dev-util/soapui-bin/soapui-bin-5.7.2.ebuild
index 8d3b1d351..3e1472030 100644
--- a/dev-util/soapui/soapui-5.7.2.ebuild
+++ b/dev-util/soapui-bin/soapui-bin-5.7.2.ebuild
@@ -5,17 +5,18 @@ EAPI=8
 
 DESCRIPTION="The Swiss-Army Knife for SOAP Testing"
 HOMEPAGE="https://www.soapui.org/ https://github.com/SmartBear/soapui"
+SRC_URI="https://dl.eviware.com/soapuios/${PV}/SoapUI-${PV}-linux-bin.tar.gz"
+S="${WORKDIR}/SoapUI-${PV}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-SRC_URI="https://dl.eviware.com/soapuios/${PV}/SoapUI-${PV}-linux-bin.tar.gz"
 
 RESTRICT="strip mirror"
 
 RDEPEND=">=virtual/jre-1.6"
 
 INSTALLDIR="/opt/SoapUI"
-S="${WORKDIR}/SoapUI-${PV}"
 
 src_install() {
 	# application
@@ -31,6 +32,8 @@ src_install() {
 	chmod 755 "${D}/${INSTALLDIR}/bin/toolrunner.sh"
 	chmod 755 "${D}/${INSTALLDIR}/bin/wargenerator.sh"
 
+	dosym -r "${INSTALLDIR}/bin/soapui.sh" /usr/bin/soapui
+
 	# default docs
 	dodoc README.md
 	dodoc RELEASENOTES.txt
diff --git a/dev-util/soapui/soapui-5.7.0.ebuild b/dev-util/soapui-bin/soapui-bin-5.8.0.ebuild
similarity index 70%
rename from dev-util/soapui/soapui-5.7.0.ebuild
rename to dev-util/soapui-bin/soapui-bin-5.8.0.ebuild
index 2864b8bb7..3e1472030 100644
--- a/dev-util/soapui/soapui-5.7.0.ebuild
+++ b/dev-util/soapui-bin/soapui-bin-5.8.0.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="The Swiss-Army Knife for SOAP Testing"
-HOMEPAGE="https://www.soapui.org/"
+HOMEPAGE="https://www.soapui.org/ https://github.com/SmartBear/soapui"
+SRC_URI="https://dl.eviware.com/soapuios/${PV}/SoapUI-${PV}-linux-bin.tar.gz"
+S="${WORKDIR}/SoapUI-${PV}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-SRC_URI="https://s3.amazonaws.com/downloads.eviware/soapuios/${PV}/SoapUI-${PV}-linux-bin.tar.gz"
+
 RESTRICT="strip mirror"
 
 RDEPEND=">=virtual/jre-1.6"
 
 INSTALLDIR="/opt/SoapUI"
-S="${WORKDIR}/SoapUI-${PV}"
 
 src_install() {
 	# application
 	insinto ${INSTALLDIR}
-	doins -r Tutorials bin lib wsi-test-tools soapui-settings.xml
+	doins -r Tutorials bin lib HelloWS-soapui-project.xml soapui-settings.xml
 
 	# binaries
 	chmod 755 "${D}/${INSTALLDIR}/bin/loadtestrunner.sh"
@@ -30,6 +32,8 @@ src_install() {
 	chmod 755 "${D}/${INSTALLDIR}/bin/toolrunner.sh"
 	chmod 755 "${D}/${INSTALLDIR}/bin/wargenerator.sh"
 
+	dosym -r "${INSTALLDIR}/bin/soapui.sh" /usr/bin/soapui
+
 	# default docs
 	dodoc README.md
 	dodoc RELEASENOTES.txt
diff --git a/profiles/updates/2Q-2025 b/profiles/updates/2Q-2025
index 09083f1ef..20fae004f 100644
--- a/profiles/updates/2Q-2025
+++ b/profiles/updates/2Q-2025
@@ -1 +1,2 @@
 move dev-python/http-tools dev-python/http_tools
+move dev-util/soapui dev-util/soapui-bin