diff --git a/lang/ldc/Makefile b/lang/ldc/Makefile
index f1863d96b6ad..caf2718d997d 100644
--- a/lang/ldc/Makefile
+++ b/lang/ldc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The LLVM-based D compiler
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	clang39:devel/llvm39
+BUILD_DEPENDS=	clang40:devel/llvm40
 LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 BROKEN_aarch64=		fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
@@ -26,10 +26,11 @@ USES=		cmake
 CMAKE_ARGS+=	-DD_COMPILER:STRING="${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/}/bin/ldmd2" \
 		-DBUILD_SHARED_LIBS:STRING="BOTH"
 
-CC=		clang39
-CXX=		clang++39
+CC=		clang40
+CXX=		clang++40
 
 BOOTVER=	0.17.5
+LLVM_CONFIG=	llvm-config40
 LDCVER=		${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/$/-src/}
 
@@ -39,13 +40,15 @@ DISTFILES+=	${PORTNAME}-${BOOTVER}-src.tar.gz:bootstrap
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
-PLIST_SUB+=	LDC_I386=""
-.elif ${ARCH} == "i386"
-PLIST_SUB+=	LDC_I386="@comment "
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's|$${llvm_config_names}|${LLVM_CONFIG}|g' \
+		${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/}/cmake/Modules/FindLLVM.cmake \
+		${WRKSRC}/cmake/Modules/FindLLVM.cmake
+
 pre-configure:
-		@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${CMAKE_BIN} .
-		@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${MAKE}
+	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${CMAKE_BIN} .
+	@cd ${WRKDIR}/${PORTNAME}-${BOOTVER:S/$/-src/} && ${MAKE}
 
 .include <bsd.port.post.mk>
diff --git a/lang/ldc/pkg-plist b/lang/ldc/pkg-plist
index 202eb49305db..b35ccd015e85 100644
--- a/lang/ldc/pkg-plist
+++ b/lang/ldc/pkg-plist
@@ -385,7 +385,7 @@ include/d/ldc/arrayinit.d
 include/d/ldc/asan.d
 include/d/ldc/attributes.d
 include/d/ldc/dcompute.d
-%%LDC_I386%%include/d/ldc/dynamic_compile.d
+include/d/ldc/dynamic_compile.d
 include/d/ldc/eh_asm.S
 include/d/ldc/eh_msvc.d
 include/d/ldc/gccbuiltins_aarch64.di
@@ -570,10 +570,10 @@ lib/libdruntime-ldc-shared.so
 lib/libdruntime-ldc-shared.so.2.0.77
 lib/libdruntime-ldc-shared.so.77
 lib/libdruntime-ldc.a
-%%LDC_I386%%lib/libldc-jit-rt.a
-%%LDC_I386%%lib/libldc-jit.so
-%%LDC_I386%%lib/libldc-jit.so.2.0.77
-%%LDC_I386%%lib/libldc-jit.so.77
+lib/libldc-jit-rt.a
+lib/libldc-jit.so
+lib/libldc-jit.so.2.0.77
+lib/libldc-jit.so.77
 lib/libldc-profile-rt.a
 lib/libphobos2-ldc-debug-shared.so
 lib/libphobos2-ldc-debug-shared.so.2.0.77