diff --git a/ChangeLog b/ChangeLog
index 2467a84f4..7bbc3bfc7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-23  Olivier Müller  <om@omnis.ch>
+	* lib.inc.php3: don't add a "/" to $cfgPmaAbsoluteUri if it's empty!	
+
 2001-08-22  Robin Johnson  <robbat2@orbis-terrarum.net>
 	* config.inc.php3: $cfgServers[1]['connect_type'] preferred connection type
 	* lib.inc.php3 - line 285: $cfgServer['connect_type'] implemented
diff --git a/lib.inc.php3 b/lib.inc.php3
index 66c5fc413..0d7eac7dc 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -95,7 +95,7 @@ if (!defined('__LIB_INC__')){
     }
     // Adds a trailing slash et the end of the phpMyAdmin uri if it does not
     // exist
-    if (substr($cfgPmaAbsoluteUri, -1) != '/') {
+    if ($cfgPmaAbsoluteUri != '' && substr($cfgPmaAbsoluteUri, -1) != '/') {
         $cfgPmaAbsoluteUri .= '/';
     }
     include('./defines.inc.php3');