diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..57948c31
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: google
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortBlocksOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: false
+IndentWidth: 4
+PointerBindsToType: false
+ColumnLimit: 0
+ForEachMacros: [ TAILQ_FOREACH, TAILQ_FOREACH_REVERSE, SLIST_FOREACH, CIRCLEQ_FOREACH, CIRCLEQ_FOREACH_REVERSE, NODES_FOREACH, NODES_FOREACH_REVERSE ]
+SpaceBeforeParens: ControlStatements
diff --git a/RELEASE-NOTES-4.8 b/RELEASE-NOTES-4.8
index 1eff3e25..f0f5923f 100644
--- a/RELEASE-NOTES-4.8
+++ b/RELEASE-NOTES-4.8
@@ -25,6 +25,10 @@ For packagers, another change is that yajl ≥ 2.0 is now required for compiling
 i3. This should not be a problem for anyone, as that version is pretty old by
 now.
 
+For contributors, note that we have starting formatting the source code with
+clang-format-3.5. This means that there will no longer be a need to argue about
+coding style when discussing patches :).
+
  ┌────────────────────────────┐
  │ Changes in v4.8            │
  └────────────────────────────┘