diff --git a/config/database.yml.dist b/config/database.yml.dist
new file mode 100644
index 000000000..3761ad512
--- /dev/null
+++ b/config/database.yml.dist
@@ -0,0 +1,30 @@
+production:
+  adapter: mysql2
+  database: zammad_prod
+  pool: 50
+  timeout: 5000
+  encoding: utf8
+  username: some_user
+  password: some_pass
+  host: 127.0.0.1
+
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  timeout: 5000
+  pool: 50
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000
+  pool: 50
+
diff --git a/config/database.yml.default b/config/database.yml.unittest
similarity index 99%
rename from config/database.yml.default
rename to config/database.yml.unittest
index bcf25e94a..716187120 100644
--- a/config/database.yml.default
+++ b/config/database.yml.unittest
@@ -18,7 +18,7 @@ test:
   database: db/test.sqlite3
   timeout: 5000
   pool: 50
-  
+
 test_mysql:
   adapter: mysql2
   database: zammad_test