diff --git a/.gitignore b/.gitignore
index 52d60dca7..46773455a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ npm-debug.log
 *.crt
 *.key
 bin/etherpad-1.deb
+credentials.json
diff --git a/settings.json.template b/settings.json.template
index f29bcbc0e..ceb9efb31 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -2,6 +2,9 @@
   This file must be valid JSON. But comments are allowed
 
   Please edit settings.json, not settings.json.template
+
+  To still commit settings without credentials you can 
+  store any credential settings in credentials.json
 */
 {
   // Name your instance!