diff --git a/ChangeLog b/ChangeLog
index f47d977658714cc47f9d292af7aafbf6f2d54abc..f88f3aee2451d007f69aae0ca68b14e46c19a6e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,8 @@ For users:
 - Fix: bug #29278 : SMTP fails with IP
 - Fix: Default language on login page.
 - Fix: Complete support of euros sign (even in PDF).
- 
+- Fix: Bad setup of phpMyAdmin for DoliWamp installer.
+
 For developers:
 - More comments in code.
 - Uniformize some code. 
diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index 5616cad31199def3f7d0efaf47fbd788bbd72fe9..8d0572d8f183722263c9532aefddb4de13bb16c1 100644
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -55,7 +55,7 @@ $i = 0;
 // full server array, just define values you need to change.
 $i++;
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
-$cfg['Servers'][$i]['port']          = '3307';      // MySQL port - leave blank for default port
+$cfg['Servers'][$i]['port']          = 'WAMPMYSQLPORT';      // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['extension']     = 'mysqli';     // The php MySQL extension to use ('mysql' or 'mysqli')
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index ad9a68887ca43e91dae1fdee772fb6dd0c04bd17..9143bf08ab5cdf5f15c8fff933da9ea7eacf848a 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -557,6 +557,7 @@ begin
 	        // sinon on prends le fichier par defaut
 	        LoadStringFromFile (srcFile, srcContents);
 	        StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+	        StringChange (srcContents, 'WAMPMYSQLPORT', myport);
 	        SaveStringToFile(destFile,srcContents, False);
 		    end