Index: head/lib/clang/Makefile
===================================================================
--- head/lib/clang/Makefile
+++ head/lib/clang/Makefile
@@ -90,7 +90,9 @@
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmdebuginfodwarf \
+SUBDIR+=libclangformat \
+	libclangtoolingcore \
+	libllvmdebuginfodwarf \
 	libllvmdebuginfopdb \
 	libllvmlibdriver \
 	libllvmlto \
Index: head/lib/clang/libclangformat/Makefile
===================================================================
--- head/lib/clang/libclangformat/Makefile
+++ head/lib/clang/libclangformat/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	clangformat
+
+SRCDIR=	tools/clang/lib/Format
+
+SRCS=	BreakableToken.cpp \
+	ContinuationIndenter.cpp \
+	Format.cpp \
+	FormatToken.cpp \
+	TokenAnnotator.cpp \
+	UnwrappedLineFormatter.cpp \
+	UnwrappedLineParser.cpp \
+	WhitespaceManager.cpp
+
+TGHDRS=	DiagnosticCommonKinds
+
+.include "../clang.lib.mk"
Index: head/lib/clang/libclangformat/Makefile.depend
===================================================================
--- head/lib/clang/libclangformat/Makefile.depend
+++ head/lib/clang/libclangformat/Makefile.depend
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Index: head/lib/clang/libclangtoolingcore/Makefile
===================================================================
--- head/lib/clang/libclangtoolingcore/Makefile
+++ head/lib/clang/libclangtoolingcore/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	clangtoolingcore
+
+SRCDIR=	tools/clang/lib/Tooling/Core
+CFLAGS+= -I${LLVM_SRCS}/tools
+SRCS=	Lookup.cpp \
+	Replacement.cpp
+
+TGHDRS=	AttrList \
+	Attrs \
+	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
+
+.include "../clang.lib.mk"
Index: head/lib/clang/libclangtoolingcore/Makefile.depend
===================================================================
--- head/lib/clang/libclangtoolingcore/Makefile.depend
+++ head/lib/clang/libclangtoolingcore/Makefile.depend
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Index: head/targets/pseudo/clang/Makefile.depend
===================================================================
--- head/targets/pseudo/clang/Makefile.depend
+++ head/targets/pseudo/clang/Makefile.depend
@@ -21,6 +21,7 @@
 .if ${MK_CLANG_EXTRAS} == "yes"
 DIRDEPS+= \
 	usr.bin/clang/bugpoint \
+	usr.bin/clang/clang-format \
 	usr.bin/clang/llc \
 	usr.bin/clang/lli \
 	usr.bin/clang/llvm-ar \
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc
+++ head/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1237,6 +1237,7 @@
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
+OLD_FILES+=usr/bin/clang-format
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-ar
Index: head/usr.bin/clang/Makefile
===================================================================
--- head/usr.bin/clang/Makefile
+++ head/usr.bin/clang/Makefile
@@ -7,6 +7,7 @@
 .if !defined(TOOLS_PREFIX)
 .if ${MK_CLANG_EXTRAS} != "no"
 SUBDIR+=bugpoint \
+	clang-format \
 	llc \
 	lli \
 	llvm-ar \
Index: head/usr.bin/clang/clang-format/Makefile
===================================================================
--- head/usr.bin/clang/clang-format/Makefile
+++ head/usr.bin/clang/clang-format/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=clang-format
+
+SRCDIR=	tools/clang/tools/clang-format
+SRCS=	ClangFormat.cpp
+
+LIBDEPS=clangrewrite \
+	clanglex \
+	clangformat \
+	clangbasic \
+	clangast \
+	clangtoolingcore \
+	llvmmc \
+	llvmcore \
+	llvmsupport \
+
+TGHDRS=	DiagnosticCommonKinds
+
+.include "../clang.prog.mk"
Index: head/usr.bin/clang/clang-format/Makefile.depend
===================================================================
--- head/usr.bin/clang/clang-format/Makefile.depend
+++ head/usr.bin/clang/clang-format/Makefile.depend
@@ -0,0 +1,32 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/clang/libclangast \
+	lib/clang/libclangbasic \
+	lib/clang/libclangformat \
+	lib/clang/libclanglex \
+	lib/clang/libclangrewrite \
+	lib/clang/libclangtoolingcore \
+	lib/clang/libllvmcore \
+	lib/clang/libllvmmc \
+	lib/clang/libllvmsupport \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libthr \
+	lib/msun \
+	lib/ncurses/ncursesw \
+	usr.bin/clang/clang-tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif