diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 54017670aa93..7598b876c460 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	11.0.0rc4
+DISTVERSION=	11.0.0
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
@@ -316,12 +316,13 @@ NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
 FREEBSD_BACKENDS+=	AMDGPU
 NATIVE_BACKENDS+=	AMDGPU
 .endif
-STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \
-			NVPTX SystemZ WebAssembly XCore
+STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \
+			MSP430 NVPTX SystemZ WebAssembly XCore
 _BE_LIBS_COMMON=	CodeGen Desc Info
 _BE_LIBS_AArch64=	AsmParser Disassembler Utils
 _BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
 _BE_LIBS_ARM=		AsmParser Disassembler Utils
+_BE_LIBS_AVR=		AsmParser Disassembler
 _BE_LIBS_BPF=		AsmParser Disassembler 
 _BE_LIBS_Hexagon=	AsmParser Disassembler
 _BE_LIBS_Lanai=		AsmParser Disassembler
diff --git a/devel/llvm11/distinfo b/devel/llvm11/distinfo
index 7d4123f7599f..b520e66a8bb9 100644
--- a/devel/llvm11/distinfo
+++ b/devel/llvm11/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1601492118
-SHA256 (llvm-11.0.0rc4.src.tar.xz) = 9e46267ae7fcb68f2d96a73f7a13b6e573a9076a35e01f6bbc37dfd80433b2c4
-SIZE (llvm-11.0.0rc4.src.tar.xz) = 39479088
-SHA256 (clang-11.0.0rc4.src.tar.xz) = eb18913aba50e940b94879e5db322fbc38e0e36276c32cc9b6031a716560ba73
-SIZE (clang-11.0.0rc4.src.tar.xz) = 14983708
-SHA256 (compiler-rt-11.0.0rc4.src.tar.xz) = 505081dbd05c9dc707acc5c4fe4825a20e23c3ddcd1891ffec0dd59bc8f31f95
-SIZE (compiler-rt-11.0.0rc4.src.tar.xz) = 2138312
-SHA256 (clang-tools-extra-11.0.0rc4.src.tar.xz) = 1f98352720d77fd6ef6e8368efa644b3d6a33f4979b0b206abaac0f2c1de1dc9
-SIZE (clang-tools-extra-11.0.0rc4.src.tar.xz) = 1513540
-SHA256 (lld-11.0.0rc4.src.tar.xz) = ebb7cb41a0b88f5076ff01d1ecab61505dbb9fc86a42c88efc81fa722918a846
-SIZE (lld-11.0.0rc4.src.tar.xz) = 1247224
-SHA256 (lldb-11.0.0rc4.src.tar.xz) = d26be8f40879f7989520ae595b716bc40b5f211034ea0f48a666ac559f2e2218
-SIZE (lldb-11.0.0rc4.src.tar.xz) = 9739912
-SHA256 (openmp-11.0.0rc4.src.tar.xz) = 7ee9773f2e29f58166421f006c911bb321af0dcb1708fed36abbd674354571e1
-SIZE (openmp-11.0.0rc4.src.tar.xz) = 975212
+TIMESTAMP = 1602536201
+SHA256 (llvm-11.0.0.src.tar.xz) = 913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469
+SIZE (llvm-11.0.0.src.tar.xz) = 39480848
+SHA256 (clang-11.0.0.src.tar.xz) = 0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209
+SIZE (clang-11.0.0.src.tar.xz) = 14982988
+SHA256 (compiler-rt-11.0.0.src.tar.xz) = 374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234
+SIZE (compiler-rt-11.0.0.src.tar.xz) = 2141408
+SHA256 (clang-tools-extra-11.0.0.src.tar.xz) = fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09
+SIZE (clang-tools-extra-11.0.0.src.tar.xz) = 1512436
+SHA256 (lld-11.0.0.src.tar.xz) = efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c
+SIZE (lld-11.0.0.src.tar.xz) = 1247188
+SHA256 (lldb-11.0.0.src.tar.xz) = 8570c09f57399e21e0eea0dcd66ae0231d47eafc7a04d6fe5c4951b13c4d2c72
+SIZE (lldb-11.0.0.src.tar.xz) = 9740312
+SHA256 (openmp-11.0.0.src.tar.xz) = 2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c
+SIZE (openmp-11.0.0.src.tar.xz) = 975108
diff --git a/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
index 62eeef7e8c16..5366b3dd464e 100644
--- a/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ b/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
@@ -1,5 +1,5 @@
---- ../compiler-rt-11.0.0rc4.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ ../compiler-rt-11.0.0rc4.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
+--- ../compiler-rt-11.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
++++ ../compiler-rt-11.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -597,7 +597,7 @@
  #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
  #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
diff --git a/devel/llvm11/pkg-plist b/devel/llvm11/pkg-plist
index dd32788c9615..f76b54803a51 100644
--- a/devel/llvm11/pkg-plist
+++ b/devel/llvm11/pkg-plist
@@ -3440,11 +3440,6 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a