diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index b7fbcb37a30e..3e85ba3a868c 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1643 2011/07/09 14:52:02 jmcneill Exp $
+#	$NetBSD: mi,v 1.1644 2011/07/14 21:38:56 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -15,6 +15,7 @@
 ./usr/bin/cc					comp-c-bin		gcccmds
 ./usr/bin/clang					comp-c-bin		llvm
 ./usr/bin/clang++				comp-c-bin		llvm
+./usr/bin/clang-cpp				comp-c-bin		llvm
 ./usr/bin/config				comp-util-bin
 ./usr/bin/crunchgen				comp-c-bin
 ./usr/bin/crunchide				comp-c-bin
diff --git a/external/bsd/llvm/bin/clang/Makefile b/external/bsd/llvm/bin/clang/Makefile
index 9c6b6f84fcbf..62924018460e 100644
--- a/external/bsd/llvm/bin/clang/Makefile
+++ b/external/bsd/llvm/bin/clang/Makefile
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.12 2011/07/13 23:48:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.13 2011/07/14 21:38:57 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
 
 .if !defined(HOSTPROG)
 SYMLINKS+=	clang ${BINDIR}/clang++
+SYMLINKS+=	clang ${BINDIR}/clang-cpp
 .endif
 
 .include <bsd.init.mk>