diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 07450f37d05..35407da1d07 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,37 +1,50 @@
 # Template file for 'PhpStorm'
 pkgname=PhpStorm
-version=2020.1.4
+version=2024.2.1
 revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+archs="x86_64 aarch64"
+depends="virtual?java-environment"
 short_desc="Lightning-smart PHP IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/phpstorm"
-distfiles="https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"
-checksum=a23922f5f93bc8df1f2aabbb0f9969e27d28f706c09d18d66d4cc2d56c52ddc9
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64)
+		distfiles="https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"
+		checksum=a9df519875815cd05b65324b4f0343584bd88f72df88d82a8dd87fc501b2c001
+		;;
+
+	aarch64)
+		distfiles="https://download.jetbrains.com/webide/PhpStorm-${version}-aarch64.tar.gz"
+		checksum=c360347841f3631e09b91a99e73433525508ef2b9ebac10ae6f0a518335a815e
+		;;
+esac
+
 repository=nonfree
 restricted=yes
 nopie=yes
 python_version=3
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-windows-amd64.exe
+	rm -rf plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-windows-arm64.exe
+	rm -rf plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-darwin-amd64
+	rm -rf plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-darwin-arm64
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/phpstorm.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
+			rm -rf lib/async-profiler/aarch64
+			rm -rf plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/phpstorm64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
-			rm -rf lib/pty4j-native/linux/x86_64
+		aarch64)
+			rm -rf lib/pty4j/linux/x86_64
+			rm -rf lib/native/linux-x86_64
+			rm -rf lib/async-profiler/amd64
+			rm -rf lib/jna/amd64
+			rm -rf plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-amd64
+			rm -rf plugins/platform-ijent-impl/ijent-x86_64-unknown-linux-musl-release
+			rm -rf plugins/cwm-plugin/quiche-native/linux-x86-64
 			;;
 	esac
 }
@@ -49,9 +62,9 @@ do_install() {
 
 	local launcher_path="bin/phpstorm.sh"
 	sed -i '1 s/$/\nPHPSTORM_JDK=${PHPSTORM_JDK:-${IDEA_JDK}}/' "${launcher_path}"
-
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
+	vcopy jbr ${TARGET_PATH}
 	vcopy lib ${TARGET_PATH}
 	vcopy plugins ${TARGET_PATH}
 	vcopy product-info.json ${TARGET_PATH}