diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile
index c4c210a069b0..933bb4996e7e 100644
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@@ -1,82 +1,84 @@
 PORTNAME=	ispc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.24.0
-PORTREVISION=	1
+DISTVERSION=	1.25.1
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	abb4800eb9553e3710fd0dd293a552a9af361396.diff:-p1 # backport of https://github.com/ispc/ispc/pull/3074/commits
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel's compiler for high-performance SIMD programming
 WWW=		https://ispc.github.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	only available for these architectures
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		m4:devel/m4
 LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_VERSION} \
 		libtbb.so:devel/onetbb
 
-USES=		bison cmake compiler:c++17-lang llvm:lib,min=15,max=15 python:build,test shebangfix
+USES=		bison cmake compiler:c++17-lang llvm:lib,min=16,max=16 python:build,test shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	google:googletest:6a7ed31:googletest/ispcrt/tests/vendor/google/googletest
 
-SHEBANG_FILES=	*.py
+SHEBANG_GLOB=	*.py
 
 CONFIGURE_ENV=	PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} # see https://github.com/ispc/ispc/issues/2318
 CMAKE_OFF=	ISPC_NO_DUMPS ISPCRT_BUILD_GPU ISPC_INCLUDE_TESTS ISPCRT_BUILD_TESTS ISPC_INCLUDE_EXAMPLES
 CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config
 
 BINARY_ALIAS=	flex=${LOCALBASE}/bin/flex python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE_amd64=	ARM XE
 OPTIONS_DEFINE_i386=	ARM
 
 ARM_DESC=		Enable ARM support - requires ARM backend in LLVM
 ARM_CMAKE_BOOL=		ARM_ENABLED
 
 XE_DESC=		Enable Intel Xe support
 XE_BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_VERSION}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION}
 XE_LIB_DEPENDS=		libze_loader.so:devel/level-zero \
 			libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@llvm${LLVM_VERSION}
 XE_CMAKE_BOOL=		XE_ENABLED
 XE_CMAKE_BOOL_OFF=	ISPCRT_BUILD_TESTS
 XE_CMAKE_ON=		-DXE_DEPS_DIR:PATH="${LOCALBASE}/llvm${LLVM_VERSION}" -DISPC_INCLUDE_XE_EXAMPLES=OFF
 XE_PLIST_FILES=		include/ispcrt/ispcrt.h \
 			include/ispcrt/ispcrt.hpp \
 			include/ispcrt/ispcrt.isph \
 			lib/cmake/ispcrt-${PORTVERSION}/Finddpcpp_compiler.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/Findlevel_zero.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/interop.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispc.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrtConfig.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports.cmake \
 			lib/libispcrt.so \
 			lib/libispcrt.so.1 \
 			lib/libispcrt.so.${PORTVERSION} \
 			lib/libispcrt_static.a
 XE_BROKEN=		Unknown architecture
 
 do-test: # all tests pass
-	@cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py
+	@cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./scripts/run_tests.py
 
 test-check-all: # the upstream claims that some of these checks are broken without using their patched llvm version, hence using llvm-devel
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-all
 
 run-examples: build
 	@[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed"
 .for e in simple sort mandelbrot stencil
 	@cd ${WRKSRC}/examples/${e} && \
 	${ECHO} "===> Running example ${e}" && \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
 	./${e}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo
index 7d28c79664db..df44e4425810 100644
--- a/devel/ispc/distinfo
+++ b/devel/ispc/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1716879870
-SHA256 (ispc-ispc-v1.24.0_GH0.tar.gz) = a45ec5402d8a3b23d752125a083fa031becf093b8304ccec55b1c2f37b5479c3
-SIZE (ispc-ispc-v1.24.0_GH0.tar.gz) = 19673937
+TIMESTAMP = 1729271145
+SHA256 (ispc-ispc-v1.25.1_GH0.tar.gz) = 77e094f9324bbdd40ad56f80039f94d9f6621cf8a56e1c57168e2b4d10752f9f
+SIZE (ispc-ispc-v1.25.1_GH0.tar.gz) = 19804554
 SHA256 (google-googletest-6a7ed31_GH0.tar.gz) = f488bc430d2b5fdbc51711b142fd50dbf0f33012fa65c5f8e7d4f908ed935bcf
 SIZE (google-googletest-6a7ed31_GH0.tar.gz) = 904250
+SHA256 (abb4800eb9553e3710fd0dd293a552a9af361396.diff) = bfc4baad864bbdb3b775d3410383649b74cdaeef4952e13175304612ed62fb35
+SIZE (abb4800eb9553e3710fd0dd293a552a9af361396.diff) = 1149
diff --git a/devel/ispc/files/patch-src_opt_ImproveMemoryOps.cpp b/devel/ispc/files/patch-src_opt_ImproveMemoryOps.cpp
deleted file mode 100644
index 3e6b2f30359b..000000000000
--- a/devel/ispc/files/patch-src_opt_ImproveMemoryOps.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/opt/ImproveMemoryOps.cpp.orig	2024-06-01 21:03:34 UTC
-+++ src/opt/ImproveMemoryOps.cpp
-@@ -7,6 +7,8 @@
- #include "ImproveMemoryOps.h"
- #include "builtins-decl.h"
- 
-+#include <unordered_map>
-+
- namespace ispc {
- 
- using namespace builtin;
diff --git a/devel/ispc/files/patch-src_opt_ReplacePseudoMemoryOps.cpp b/devel/ispc/files/patch-src_opt_ReplacePseudoMemoryOps.cpp
deleted file mode 100644
index d8be02bca950..000000000000
--- a/devel/ispc/files/patch-src_opt_ReplacePseudoMemoryOps.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/opt/ReplacePseudoMemoryOps.cpp.orig	2024-06-01 21:18:54 UTC
-+++ src/opt/ReplacePseudoMemoryOps.cpp
-@@ -7,6 +7,8 @@
- #include "ReplacePseudoMemoryOps.h"
- #include "builtins-decl.h"
- 
-+#include <unordered_map>
-+
- namespace ispc {
- 
- using namespace builtin;