diff --git a/cpp-style-and-conventions.md b/cpp-style-and-conventions.md
index 473f4b5..eaeb7c5 100644
--- a/cpp-style-and-conventions.md
+++ b/cpp-style-and-conventions.md
@@ -132,6 +132,7 @@
 
 * Line length should be limited to 80 characters.
 * Indentation should be done with 4 space characters.
+* Files should use Unix-style newlines (\n).
 
 ### Clang Formatting
 
diff --git a/style/cpp/.clang-format b/style/cpp/.clang-format
index cab3139..945adae 100644
--- a/style/cpp/.clang-format
+++ b/style/cpp/.clang-format
@@ -49,6 +49,7 @@
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: false
 DerivePointerAlignment: false
 PointerAlignment: Left
 DisableFormat:   false
@@ -110,6 +111,7 @@
 SpacesInSquareBrackets: false
 Standard:        Latest
 TabWidth:        4
+UseCRLF: false
 UseTab:          Never
 ...