diff --git a/.gitattributes b/.gitattributes
index a2d66d32..e29707ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,4 +8,8 @@
 *.hpp text
 
 # Windows specific files should retain windows line-endings
-*.sln text eol=crlf
\ No newline at end of file
+*.sln text eol=crlf
+
+# Keep the single include header with LFs to make sure it is uploaded,
+# hashed etc with LF
+single_include/*.hpp eol=lf
diff --git a/scripts/generateSingleHeader.py b/scripts/generateSingleHeader.py
index b1d18673..04eaf46c 100755
--- a/scripts/generateSingleHeader.py
+++ b/scripts/generateSingleHeader.py
@@ -46,7 +46,7 @@ def generate(v):
     outDir = os.path.dirname(outputPath)
     if not os.path.exists(outDir):
         os.makedirs(outDir)
-    out = open( outputPath, 'w' )
+    out = open( outputPath, 'w', newline='\n' )
 
     def write( line ):
         if globals['includeImpl'] or globals['implIfDefs'] == -1: