diff --git a/.gitignore b/.gitignore
index a6a4af1f629316192e23d5aaa53f7e7ac164b564..56ac3a4924d9e61fb9f8dd6a687794bb845e04fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,16 @@
+######################
+# Section for 'ignore patterns' from the project-template
+#
+# !! Don't edit anything in this section to avoid merge conflics !!
+######################
 build
 .project
+*~
+
+######################
+# Project specific 'ignore patterns'
+#
+# Put you project specific ignores below.
+# If they are generally useful consider adding them to the 
+# project-template and the merge them in.
+######################