diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 43687f5154..93d46d9a53 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -1,3 +1,4 @@
+
 <yazgfs>
 <!-- [scheme:]host[:port][/databaseName] -->
 <!-- scheme: tcp, ssl, unix, http, sru -->
@@ -32,11 +33,15 @@
 </serverinfo>
 
 <!-- ADDITIONAL KOHA CONFIGURATION DIRECTIVE -->
+<!-- db_scheme should follow the DBD driver name --> 
+<!-- port info: mysql:3306 Pg:5432 (5433 on Debian) -->
 <config>
- <database>__MYSQL_DB__</database>
- <hostname>__MYSQL_HOST__</hostname>
- <user>__MYSQL_USER__</user>
- <pass>__MYSQL_PASS__</pass>
+ <db_scheme>__DB_TYPE__</db_scheme>
+ <database>__DB_NAME__</database>
+ <hostname>__DB_HOST__</hostname>
+ <port>__DB_PORT__</port>
+ <user>__DB_USER__</user>
+ <pass>__DB_PASS__</pass>
  <biblioserver>biblios</biblioserver>
  <biblioservershadow>1</biblioservershadow>
  <authorityserver>authorities</authorityserver>
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 3c875a96bd..2b8bf9c479 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -72,10 +72,12 @@ $prefix = $ENV{'PREFIX'} || "/usr";
   "__BASE_DIR__" => ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
   "__CGI_DIR__" => $prefix."/lib/cgi-bin/koha",
   "__LOG_DIR__" => "/var/log",
-  "__MYSQL_DB__" => "koha",
-  "__MYSQL_HOST__" => $myhost,
-  "__MYSQL_PASS__" => "katikoan",
-  "__MYSQL_USER__" => "kohaadmin",
+  "__DB_TYPE__" => "mysql",
+  "__DB_NAME__" => "koha",
+  "__DB_HOST__" => $myhost,
+  "__DB_PORT__" => "3306",
+  "__DB_USER__" => "kohaadmin",
+  "__DB_PASS__" => "katikoan",
   "__PREFIX__" => $prefix,
   "__WEBMASTER_EMAIL__" => 'webmaster@'.$mydomain,
   "__WEBSERVER_DOMAIN__" => $mydomain,