diff --git a/.gitattributes b/.gitattributes
index 9793ee465..9fa544d91 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,16 @@
+# Lineendings
 *.sln        eol=crlf
 *.vcproj     eol=crlf
 *.vcxproj*   eol=crlf
+
+# Whitespace rules
+# strict (no trailing, no tabs)
+*.cpp        whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.h          whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+
+# normal (no trailing)
+*.sql        whitespace=trailing-space,space-before-tab,cr-at-eol
+*.txt        whitespace=trailing-space,space-before-tab,cr-at-eol
+
+# special files which must ignore whitespace
+*.patch      whitespace=-trailing-space
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d5d12e0bb..ab2ce4e7c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11392"
+ #define REVISION_NR "11393"
 #endif // __REVISION_NR_H__