diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index d39df51dc39b..73ddc944ca99 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	17.0.0rc4
+DISTVERSION=	17.0.1
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
@@ -193,7 +193,9 @@ LLDB_USES=		lua:53 libedit
 LLDB_VARS=		_USES_PYTHON=python
 MLIR_DESC=		Multi-Level Intermediate Representation
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
-OPENMP_CMAKE_ON=	-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF
+OPENMP_CMAKE_ON=	-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF \
+			-DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \
+			-DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES=""
 OPENMP_PORTDOCS=	openmp
 PYCLANG_DESC=		Install python bindings to libclang
 PYCLANG_IMPLIES=	CLANG
diff --git a/devel/llvm17/distinfo b/devel/llvm17/distinfo
index 46a98ed00397..a2ccfb533a91 100644
--- a/devel/llvm17/distinfo
+++ b/devel/llvm17/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693937591
-SHA256 (llvm-project-17.0.0rc4.src.tar.xz) = 277d0671a8f389e2ae44f4fe591974bb8434c115a94ed289ab17d13a4de2940e
-SIZE (llvm-project-17.0.0rc4.src.tar.xz) = 127838724
+TIMESTAMP = 1695138286
+SHA256 (llvm-project-17.0.1.src.tar.xz) = b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9
+SIZE (llvm-project-17.0.1.src.tar.xz) = 127830376
diff --git a/devel/llvm17/pkg-plist b/devel/llvm17/pkg-plist
index 708af1efb93e..c974772b5158 100644
--- a/devel/llvm17/pkg-plist
+++ b/devel/llvm17/pkg-plist
@@ -5886,8 +5886,8 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/llvm-driver-template.cpp.in
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libFortran_main.a
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRDialect.a
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRTransforms.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%rc.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-17rc.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-17.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
@@ -5974,9 +5974,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
-llvm%%LLVM_SUFFIX%%/lib/libLTO.so.17rc
+llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.17rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.%%LLVM_MAJOR%%
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUDialect.a
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUToROCDL.a
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUTransforms.a
@@ -6269,14 +6269,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.17rc
 %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPolly.a
 %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPollyISL.a
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
-llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.17rc
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher.so
 %%STATIC_LIBS%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.17rc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%rc
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.17rc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
@@ -6380,19 +6380,19 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.17rc
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
 %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so
-%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%rc
-%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.17rc
+%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_MAJOR%%
+%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.17rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.%%LLVM_MAJOR%%
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.17rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.%%LLVM_MAJOR%%
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.17rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.%%LLVM_MAJOR%%
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.17rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.%%LLVM_MAJOR%%
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
-%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.17rc
+%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py