diff --git a/.clang-format b/.clang-format
index e5bdf13e91722918c6691ad264e47651ea83a0ee..3d5b9c4d14598989113a62a4a1c12f7842a998bf 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,54 +1,42 @@
-# http://llvm.org/releases/3.7.0/tools/clang/docs/ClangFormatStyleOptions.html
-AlignAfterOpenBracket: true
-AlignConsecutiveAssignments: true
+---
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 2
 AlignEscapedNewlinesLeft: false
-AlignOperands: true
-AlignTrailingComments: false
+AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
-BasedOnStyle: Mozilla
-BinPackArguments: false
-BinPackParameters: true # this applies to template arguments, function arguments and typedefs, so we cannot set this to false (very much unfortunately)!
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Mozilla
-BreakBeforeTernaryOperators: true
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 120
+BinPackParameters: true
+ColumnLimit:     120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 2
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
+DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-Language: Cpp
-MaxEmptyLinesToKeep: 2
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: true
 PenaltyBreakComment: 60
-PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
+PointerBindsToType: true
 SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
+Cpp11BracedListStyle: true
+Standard:        Cpp11
+IndentWidth:     2
+TabWidth:        2
+UseTab:          false
+BreakBeforeBraces: Attach
+IndentFunctionDeclarationAfterType: false
 SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp11
-TabWidth: 2
-UseTab: Never
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+...
+
diff --git a/dune/stuff/CMakeLists.txt b/dune/stuff/CMakeLists.txt
index 9a10e8b644a3c8a396b7bf98124fbc0bf13cd3c7..dbecea54498ecb36b8e6b7151767bef0e4fe6376 100644
--- a/dune/stuff/CMakeLists.txt
+++ b/dune/stuff/CMakeLists.txt
@@ -36,5 +36,7 @@ endif(dune-grid_FOUND)
 target_link_dune_default_libraries(dunestuff)
 
 add_analyze(${lib_dune_stuff_sources})
+FILE( GLOB_RECURSE _header "${CMAKE_CURRENT_SOURCE_DIR}/*.hh" )
+add_format(${lib_dune_stuff_sources} ${_header})
 
 add_subdirectory(test EXCLUDE_FROM_ALL)