diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 860bf90a292c8..67f500cd695f6 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
-DISTVERSION=	13.0.0
-PORTREVISION=	3
+DISTVERSION=	13.0.1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -99,9 +99,12 @@ OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
+OPTIONS_DEFAULT_riscv64=	OPENMP
+OPTIONS_EXCLUDE_armv6=	FLANG
+OPTIONS_EXCLUDE_armv7=	FLANG
 OPTIONS_EXCLUDE_i386=	FLANG
 OPTIONS_EXCLUDE_powerpc=	FLANG
-OPTIONS_DEFAULT_riscv64=	OPENMP
+OPTIONS_EXCLUDE_riscv64=	LLDB
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
 OPTIONS_SUB=	yes
diff --git a/devel/llvm13/distinfo b/devel/llvm13/distinfo
index 87eb583165a64..d8f03dc5e3573 100644
--- a/devel/llvm13/distinfo
+++ b/devel/llvm13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633622801
-SHA256 (llvm-project-13.0.0.src.tar.xz) = 6075ad30f1ac0e15f07c1bf062c1e1268c241d674f11bd32cdf0e040c71f2bf3
-SIZE (llvm-project-13.0.0.src.tar.xz) = 97577404
+TIMESTAMP = 1644266911
+SHA256 (llvm-project-13.0.1.src.tar.xz) = 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8
+SIZE (llvm-project-13.0.1.src.tar.xz) = 97584928
diff --git a/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td
deleted file mode 100644
index c855644e77194..0000000000000
--- a/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm/lib/Target/X86/X86InstrSystem.td.orig
-+++ llvm/lib/Target/X86/X86InstrSystem.td
-@@ -585,7 +585,7 @@
- //===----------------------------------------------------------------------===//
- // VIA PadLock crypto instructions
- let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in
--  def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP;
-+  def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB;
- 
- def : InstAlias<"xstorerng", (XSTORE)>;
-