diff --git a/CodeConventions.md b/CodeConventions.md
new file mode 100644
index 000000000..e80e04ec4
--- /dev/null
+++ b/CodeConventions.md
@@ -0,0 +1,12 @@
+
+Open Asset Import Library Coding Conventions
+==
+
+If you want to participate as a developer in the **Open Asset Import Library** please read and respect the following coding conventions. This will ensure consistency throughout the codebase and help all the Open Asset Import Library users.
+
+Spacing
+==
+
+* Use UNIX-style line endings (LF)
+* Remove any trailing whitespace
+* Expand tabs to 4 spaces
diff --git a/CodeConventions.txt b/CodeConventions.txt
deleted file mode 100644
index dcbe17ed6..000000000
--- a/CodeConventions.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-       ===============================================
-        The Asset-Importer-Library Coding conventions
-       ===============================================
-
-	If you want to participate to the Asset-Importer_Library please have a look
-	onto these coding conventions and try to follow them. They are more or less
-	some kind of guide line to help others coming into the code and help all
-	the Asset-Importer-Library users.
-	
-	 Tab width
-	===========
-	The tab width shall be 4 spaces.
-	
-	
\ No newline at end of file