diff --git a/lang/compiler-rt/Makefile b/lang/compiler-rt/Makefile
index 73151c33d3f4..ea1f829cea3f 100644
--- a/lang/compiler-rt/Makefile
+++ b/lang/compiler-rt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/12/09 20:04:40 adam Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/17 16:19:52 jperkin Exp $
 
 DISTNAME=	compiler-rt-7.0.0.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -35,6 +35,13 @@ CMAKE_ARGS+=	-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
 
 PLIST_SUBST+=	COMPILER_RT_OS_DIR=${OS_DIR}
+PLIST_VARS+=	asan
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "SunOS"
+PLIST.asan=	yes
+.endif
 
 TEST_TARGET=	check-compiler-rt
 
diff --git a/lang/compiler-rt/PLIST b/lang/compiler-rt/PLIST
index 3a25bf502730..dc4741ddb899 100644
--- a/lang/compiler-rt/PLIST
+++ b/lang/compiler-rt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/12/09 20:04:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/12/17 16:19:52 jperkin Exp $
 lib/clang/${PKGVERSION}/include/sanitizer/allocator_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/asan_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/common_interface_defs.h
@@ -15,5 +15,5 @@ lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface.h
 lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface_atomic.h
 lib/clang/${PKGVERSION}/include/xray/xray_interface.h
 lib/clang/${PKGVERSION}/include/xray/xray_log_interface.h
-lib/clang/${PKGVERSION}/share/asan_blacklist.txt
-lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
+${PLIST.asan}lib/clang/${PKGVERSION}/share/asan_blacklist.txt
+${PLIST.asan}lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
diff --git a/lang/compiler-rt/PLIST.SunOS b/lang/compiler-rt/PLIST.SunOS
new file mode 100644
index 000000000000..ba61fd1018c0
--- /dev/null
+++ b/lang/compiler-rt/PLIST.SunOS
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2018/12/17 16:19:52 jperkin Exp $
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-i386.a
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-x86_64.a