diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index ccee0f7385..73ef9daab8 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -3,3 +3,7 @@ DIST WebStorm-2025.1.2-aarch64.tar.gz 1101315108 BLAKE2B 5880ad45a0ca66b32b34393
 DIST WebStorm-2025.1.2.tar.gz 1104272386 BLAKE2B 7730506036b14f20930a84a9265b46137617ab0bf528a877abf5754d88475a43870faf6c05c249585df4c3e4d9260ad121003611228b70f5f16a04b2a1ba55dc SHA512 8b7a80244e22b6e040b9f8930ef65eb2ab72f3f1265d70e67bfbea20221f0d73d8d1e7e95fe74f1531e8201f1df291d4eb16cec2caffd224d31bfb80505485b7
 DIST WebStorm-2025.1.3-aarch64.tar.gz 1109942955 BLAKE2B 3c66fa38f4bc6fa98561ce0ed7da96e1241aec37e0b313d5b96ced959614df77739b40ed654c26688e9693854f682bb00a15e0e86eeeb8ce5f7e572f6f808646 SHA512 8b4cb33c535e0d2f77deb20eb32e1c5d0069313090c5d7663ff29d2945017cfdc3c117d63f97d77f78a3104f84ed2cfa1c5f24daabaff3e44a02ad2560f289e8
 DIST WebStorm-2025.1.3.tar.gz 1111426780 BLAKE2B 51722af2d7c4d6c544c88e6067c671d8f4cd4c2371b6df6f627b733f19f5cb68fbd77b0e9d0c47641d89ef2aabf82b680bfbd0e74ed358a39769c7190cd47f11 SHA512 c0d4d4ccff856691129fa5220350de48adc62ecd7653f3ab131b2b2d25016a47888e53986a3a0b7e6e89853eba7eed5c1e86c9bc8d5bcdbfe8e42f3e5f0d79d1
+DIST WebStorm-2025.1.4.1-aarch64.tar.gz 1065303182 BLAKE2B 5c8ef47eeb963f6c463715c05026343e425069d6f4143cbe7903c5cc94d612b129ac6494a17fa3383b510e175dab24c15ab9e3186206cbc2bdf496d67da8a981 SHA512 03c72c45e765fabfc1c7197ea817ff28363b80fd046989c78e396cba24f727ef44313e01866b254fa64c7865a9c403ce2a3eff65a2ad0b93013e4808ba48cd0e
+DIST WebStorm-2025.1.4.1.tar.gz 1068929093 BLAKE2B 082713386d2d6aef7a3dc9a24604ed4cece4f3001cfe701df421953928d74f203a08c8c92d9c2c0ffe96b6ebe9f31a23e75eae8ea75a86ae1cf807a9bcc19384 SHA512 2b4af71a7c30ffea14559b2dd42febcf8757090fb41fd5e72b66eab2d867ce52f85386c678a418d4d8ac172b3b83ce9272da9e8e2cb095e2bf93a7af2d268839
+DIST WebStorm-2025.2-aarch64.tar.gz 1173874806 BLAKE2B c4c158cc3b197b03ec33ed190445e417a9288a84625fc63f4d891c4bccd49c5f8f1546036f1e621bab981f3c7b3a896cf89f60e49534f0ee96919226c8ed200c SHA512 a7a8c22d507bfdc7e02d8a70e21f28f917e52ee3626be076e8885d879b094cc220fd9dea6bb48b3ada9bdc2ac20b3e022b2002a530c7682501209637a4a765ca
+DIST WebStorm-2025.2.tar.gz 1176800442 BLAKE2B f58d59b015326ed78cee9b05b342354235b7fc090acb532f90391ccfce15737317ac32f8f190d4bf678693fe9dbd270b9a8b1506e38b5bc122935f0db9545fd3 SHA512 765149d0abaf8b27c162cb0d8e382e78dbce68b198018bf25f72c7576afba24890f4394be43d933c8ab7087408286b0f825f7ff639eac7db7ef67346b1adf409
diff --git a/dev-util/webstorm/webstorm-2025.1.4.1.ebuild b/dev-util/webstorm/webstorm-2025.1.4.1.ebuild
new file mode 100644
index 0000000000..41746a635b
--- /dev/null
+++ b/dev-util/webstorm/webstorm-2025.1.4.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper toolchain-funcs
+
+DESCRIPTION="An integrated development environment for JavaScript and related technologies."
+HOMEPAGE="https://www.jetbrains.com/webstorm/"
+SRC_URI="
+	amd64? ( https://download-cdn.jetbrains.com/${PN}/WebStorm-${PV}.tar.gz )
+	arm64? ( https://download-cdn.jetbrains.com/${PN}/WebStorm-${PV}-aarch64.tar.gz )
+"
+
+LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBrains-individual )
+		Apache-2.0
+		BSD
+		CC0-1.0
+		CDDL
+		CDDL-1.1
+		EPL-1.0
+		GPL-2
+		GPL-2-with-classpath-exception
+		ISC
+		LGPL-2.1
+		LGPL-3
+		MIT
+		MPL-1.1
+		OFL-1.1
+		ZLIB
+"
+SLOT="0/2025"
+KEYWORDS="~amd64 ~arm64"
+IUSE="wayland"
+
+RESTRICT="bindist mirror"
+QA_PREBUILT="opt/${P}/*"
+
+BDEPEND="dev-util/debugedit
+	dev-util/patchelf
+"
+RDEPEND="
+		dev-libs/wayland
+		sys-libs/pam
+		sys-libs/zlib
+		sys-process/audit
+"
+
+src_unpack() {
+		# WebStorm unarchived directory is in format WebStorm-xxx.yyy.zzz, not ${P}
+		if use amd64 ; then
+			cp "${DISTDIR}"/WebStorm-${PV}.tar.gz "${WORKDIR}"/ || die
+		elif use arm64 ; then
+			cp "${DISTDIR}"/WebStorm-${PV}-aarch64.tar.gz "${WORKDIR}"/ || die
+		fi		
+		mkdir -p "${P}" || die
+		tar --strip-components=1 -xzf "WebStorm-${PV}".tar.gz -C "${P}" || die
+}
+
+src_prepare() {
+		tc-export OBJCOPY
+		default
+
+	if ! use arm64; then
+		local remove_me=(
+			lib/async-profiler/aarch64
+		)
+	elif ! use amd64; then
+		local remove_me=(
+			lib/async-profiler/amd64
+		)
+	fi
+
+	rm -rv "${remove_me[@]}" || die
+
+	# excepting files that should be kept for remote plugins
+	if ! use arm64 ; then
+		local skip_remote_files=(
+			"plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release"
+			"plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-arm64"
+		)
+	elif ! use amd64; then
+		local skip_remote_files=(
+			"plugins/platform-ijent-impl/ijent-x86_64-unknown-linux-musl-release"
+			"plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-amd64"
+		)
+	fi
+
+	# removing debug symbols and relocating debug files as per #876295
+	# we're escaping all the files that contain $() in their name
+	# as they should not be executed
+	find . -type f ! -name '*$(*)*' -print0 | while IFS= read -r -d '' file; do
+		for skip in "${skip_remote_files[@]}"; do
+			[[ ${file} == ./"${skip}" ]] && continue 2
+		done
+		if file "${file}" | grep -qE "ELF (32|64)-bit"; then
+			${OBJCOPY} --remove-section .note.gnu.build-id "${file}" || die
+			debugedit -b "${EPREFIX}/opt/${PN}" -d "/usr/lib/debug" -i "${file}" || die
+		fi
+	done
+
+		patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+		patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+
+		# As per https://blog.jetbrains.com/platform/2024/07/wayland-support-preview-in-2024-2/ for full wayland support
+		if use wayland; then
+				echo "-Dawt.toolkit.name=WLToolkit" >> bin/webstorm64.vmoptions || die
+		fi
+}
+
+src_install() {
+		local dir="/opt/${P}"
+
+		insinto "${dir}"
+		doins -r *
+		fperms 755 "${dir}"/bin/{"${PN}",fsnotifier,format.sh,inspect.sh,jetbrains_client.sh,ltedit.sh,remote-dev-server,remote-dev-server.sh,restarter}
+		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver}
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+		make_wrapper "${PN}" "${dir}"/bin/"${PN}"
+		newicon bin/"${PN}".svg "${PN}".svg
+		make_desktop_entry "${PN}" "WebStorm ${PV}" "${PN}" "Development;IDE;"
+
+		# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+		insinto /usr/lib/sysctl.d
+		newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
+}
diff --git a/dev-util/webstorm/webstorm-2025.2.ebuild b/dev-util/webstorm/webstorm-2025.2.ebuild
new file mode 100644
index 0000000000..41746a635b
--- /dev/null
+++ b/dev-util/webstorm/webstorm-2025.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper toolchain-funcs
+
+DESCRIPTION="An integrated development environment for JavaScript and related technologies."
+HOMEPAGE="https://www.jetbrains.com/webstorm/"
+SRC_URI="
+	amd64? ( https://download-cdn.jetbrains.com/${PN}/WebStorm-${PV}.tar.gz )
+	arm64? ( https://download-cdn.jetbrains.com/${PN}/WebStorm-${PV}-aarch64.tar.gz )
+"
+
+LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBrains-individual )
+		Apache-2.0
+		BSD
+		CC0-1.0
+		CDDL
+		CDDL-1.1
+		EPL-1.0
+		GPL-2
+		GPL-2-with-classpath-exception
+		ISC
+		LGPL-2.1
+		LGPL-3
+		MIT
+		MPL-1.1
+		OFL-1.1
+		ZLIB
+"
+SLOT="0/2025"
+KEYWORDS="~amd64 ~arm64"
+IUSE="wayland"
+
+RESTRICT="bindist mirror"
+QA_PREBUILT="opt/${P}/*"
+
+BDEPEND="dev-util/debugedit
+	dev-util/patchelf
+"
+RDEPEND="
+		dev-libs/wayland
+		sys-libs/pam
+		sys-libs/zlib
+		sys-process/audit
+"
+
+src_unpack() {
+		# WebStorm unarchived directory is in format WebStorm-xxx.yyy.zzz, not ${P}
+		if use amd64 ; then
+			cp "${DISTDIR}"/WebStorm-${PV}.tar.gz "${WORKDIR}"/ || die
+		elif use arm64 ; then
+			cp "${DISTDIR}"/WebStorm-${PV}-aarch64.tar.gz "${WORKDIR}"/ || die
+		fi		
+		mkdir -p "${P}" || die
+		tar --strip-components=1 -xzf "WebStorm-${PV}".tar.gz -C "${P}" || die
+}
+
+src_prepare() {
+		tc-export OBJCOPY
+		default
+
+	if ! use arm64; then
+		local remove_me=(
+			lib/async-profiler/aarch64
+		)
+	elif ! use amd64; then
+		local remove_me=(
+			lib/async-profiler/amd64
+		)
+	fi
+
+	rm -rv "${remove_me[@]}" || die
+
+	# excepting files that should be kept for remote plugins
+	if ! use arm64 ; then
+		local skip_remote_files=(
+			"plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release"
+			"plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-arm64"
+		)
+	elif ! use amd64; then
+		local skip_remote_files=(
+			"plugins/platform-ijent-impl/ijent-x86_64-unknown-linux-musl-release"
+			"plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-amd64"
+		)
+	fi
+
+	# removing debug symbols and relocating debug files as per #876295
+	# we're escaping all the files that contain $() in their name
+	# as they should not be executed
+	find . -type f ! -name '*$(*)*' -print0 | while IFS= read -r -d '' file; do
+		for skip in "${skip_remote_files[@]}"; do
+			[[ ${file} == ./"${skip}" ]] && continue 2
+		done
+		if file "${file}" | grep -qE "ELF (32|64)-bit"; then
+			${OBJCOPY} --remove-section .note.gnu.build-id "${file}" || die
+			debugedit -b "${EPREFIX}/opt/${PN}" -d "/usr/lib/debug" -i "${file}" || die
+		fi
+	done
+
+		patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+		patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+
+		# As per https://blog.jetbrains.com/platform/2024/07/wayland-support-preview-in-2024-2/ for full wayland support
+		if use wayland; then
+				echo "-Dawt.toolkit.name=WLToolkit" >> bin/webstorm64.vmoptions || die
+		fi
+}
+
+src_install() {
+		local dir="/opt/${P}"
+
+		insinto "${dir}"
+		doins -r *
+		fperms 755 "${dir}"/bin/{"${PN}",fsnotifier,format.sh,inspect.sh,jetbrains_client.sh,ltedit.sh,remote-dev-server,remote-dev-server.sh,restarter}
+		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver}
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+		make_wrapper "${PN}" "${dir}"/bin/"${PN}"
+		newicon bin/"${PN}".svg "${PN}".svg
+		make_desktop_entry "${PN}" "WebStorm ${PV}" "${PN}" "Development;IDE;"
+
+		# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+		insinto /usr/lib/sysctl.d
+		newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
+}