diff --git a/.clang-format b/.clang-format
index 61441ef6..d68fa440 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,7 +5,8 @@ Standard: Cpp11
 ColumnLimit: 0
 
 # We want a space between the type and the star for pointer types.
-PointerBindsToType: false
+DerivePointerAlignment: false
+PointerAlignment: Right
 
 # We use template< without space.
 SpaceAfterTemplateKeyword: false
@@ -43,7 +44,7 @@ NamespaceIndentation: None
 # The coding style does not specify the following, but this is what gives
 # results closest to the existing code.
 AlignAfterOpenBracket: true
-AlwaysBreakTemplateDeclarations: true
+BreakTemplateDeclarations: Yes
 
 # Ideally we should also allow less short function in a single line, but
 # clang-format does not handle that.
@@ -60,3 +61,6 @@ ForEachMacros:   [ foreach, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENC
 
 # Break constructor initializers before the colon and after the commas.
 BreakConstructorInitializers: BeforeColon
+
+# Empty blocks should be {}
+SpaceInEmptyBraces: Always