diff --git a/config.defaults b/config.defaults
index 625d47d57f32a74d1bb42039efbeb4102da7e3c7..c9101986c5d0099b0031f68665e05e54d0472ac2 100644
--- a/config.defaults
+++ b/config.defaults
@@ -21,24 +21,34 @@
 # ** end header
 #
 
-# Commands
-MYSQL_CMD=$(command -v mysql) # The MySQL client program.
-MYSQLADMIN_CMD=$(command -v mysqladmin) # The mysqladmin program which comes with the MySQL client.
-MYSQLDUMP_CMD=$(command -v mysqldump) # The mysqldump program which comes with the MySQL client.
-MYSQL_CONFIG_EDITOR_CMD=$(command -v mysql_config_editor) # The mysql_config_editor program which is used to store the credentials.
+# # Commands
+# The MySQL client program.
+MYSQL_CMD=$(command -v mysql)
+# The mysqladmin program which comes with the MySQL client.
+MYSQLADMIN_CMD=$(command -v mysqladmin)
+# The mysqldump program which comes with the MySQL client.
+MYSQLDUMP_CMD=$(command -v mysqldump)
+# The mysql_config_editor program which is used to store the credentials.
+MYSQL_CONFIG_EDITOR_CMD=$(command -v mysql_config_editor)
 
-# MySQL Connection
-MYSQL_HOST=localhost # The host of the MySQL server.
-MYSQL_PORT=3306 # The port number of the MySQL server.
-MYSQL_USER=root # The user for the installation. Note: This is not the user
-                # which will then be used by the CaosDB Server.
+# # MySQL Connection
+# The host of the MySQL server.
+MYSQL_HOST=localhost
+# The port number of the MySQL server.
+MYSQL_PORT=3306
+# The user for the installation. Note: This is not the user
+# which will then be used by the CaosDB Server.
+MYSQL_USER=root
 
-# DATABASE
-DATABASE_NAME=caosdb # The name of the SQL database.
-DATABASE_USER=caosdb # The user which is used by the CaosDB Server for accessing
-                     # the database.     
-DATABASE_USER_PW=random1234 # The password for the database user.  Leave empty
-                            # if you want to be prompted at make time.
+# # DATABASE
+# The name of the SQL database.
+DATABASE_NAME=caosdb
+# The user which is used by the CaosDB Server for accessing
+# the database.
+DATABASE_USER=caosdb
+# The password for the database user.  Leave empty
+# if you want to be prompted at make time.
+DATABASE_USER_PW=random1234
 
 # A comma-separated list of hosts from which MySQL will accept logins. This
 # option follows the MySQL-style for host-names and ip addresses. E.g. `%` is a