diff --git a/.clang-format b/.clang-format
index 563cd9a0..2b4f234c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,2 +1,6 @@
 BasedOnStyle: Chromium
 IndentWidth: 4
+Standard: Cpp11
+
+# Don't reflow nested comments
+CommentPragmas: '^ //'