diff -Nru llvm-defaults-0.26/debian/changelog llvm-defaults-0.27/debian/changelog
--- llvm-defaults-0.26/debian/changelog	2014-11-14 15:14:37.000000000 +0100
+++ llvm-defaults-0.27/debian/changelog	2015-09-29 16:23:26.000000000 +0200
@@ -1,3 +1,9 @@
+llvm-defaults (0.27) UNRELEASED; urgency=medium
+
+  * Add clang-format. Closes: #800374
+
+ -- Mathieu Malaterre <mathieu@debian>  Tue, 29 Sep 2015 16:22:55 +0200
+
 llvm-defaults (0.26) unstable; urgency=medium
 
   * Remove some artifacts
diff -Nru llvm-defaults-0.26/debian/control llvm-defaults-0.27/debian/control
--- llvm-defaults-0.26/debian/control	2014-09-20 12:05:29.000000000 +0200
+++ llvm-defaults-0.27/debian/control	2015-09-29 16:10:22.000000000 +0200
@@ -66,6 +66,19 @@
  .
  This is a dependency package providing the default clang compiler.
 
+Package: clang-format
+Architecture: any
+Depends: clang-format-${pv:llvm} ${reqv:llvm}, ${misc:Depends}
+Description: C, C++ and Objective-C compiler (LLVM based)
+ Clang project is a C, C++, Objective C and Objective C++ front-end
+ for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
+ Collection (GCC).
+ .
+ Clang implements all of the ISO C++ 1998 and 2001 standards and also provides
+ a partial support of C++1y.
+ .
+ This is a dependency package providing the default clang-format package.
+
 Package: libclang1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-${pv:llvm} ${reqv:llvm}
diff -Nru llvm-defaults-0.26/debian/rules llvm-defaults-0.27/debian/rules
--- llvm-defaults-0.26/debian/rules	2014-11-14 14:58:35.000000000 +0100
+++ llvm-defaults-0.27/debian/rules	2015-09-29 16:22:26.000000000 +0200
@@ -50,7 +50,7 @@
 CV_LLVM		:= 1:$(CURRENT_VERSION)-$(REL_NO_35)
 
 distribution := $(shell lsb_release -is)
-all_packages   := llvm llvm-runtime llvm-dev libllvm-ocaml-dev clang libclang1 libclang-dev
+all_packages   := llvm llvm-runtime llvm-dev libllvm-ocaml-dev clang libclang1 libclang-dev clang-format
 no_packages    := llvm-gcc # must be built?
 
 LLDB_SUPPORTED=amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel
@@ -188,6 +188,15 @@
 		/usr/lib/ocaml/METAS/META.llvm-$(CURRENT_VERSION) /usr/lib/ocaml/METAS/META.llvm \
 		/usr/lib/ocaml/llvm-$(CURRENT_VERSION) /usr/lib/ocaml/llvm
 
+	: # clang-format
+	dh_link -pclang-format \
+			/usr/bin/clang-format-$(PV_LLVM) \
+			/usr/bin/clang-format
+	if test $(CURRENT_VERSION) -ge 3.6; then \
+		dh_link -pclang-format \
+				/usr/bin/clang-format-diff-$(PV_LLVM) \
+				/usr/bin/clang-format-diff ; \
+	fi
 	: # clang
 	dh_installdirs -pclang \
 		usr/bin usr/share/man/man1