diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index b3b833557f6..704bb777374 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -49,12 +49,18 @@ if (!function_exists('xdebug_is_enabled'))
 
 if (function_exists('socket_create'))
 {
-    $address = empty($conf->global->XDEBUG_SERVER)?'127.0.0.1':$conf->global->XDEBUG_SERVER;
-    $port = empty($conf->global->XDEBUG_PORT)?9000:$conf->global->XDEBUG_PORT;
+    $address = ini_get('xdebug.remote_host')?ini_get('xdebug.remote_host'):'127.0.0.1';
+    $port = ini_get('xdebug.remote_port')?ini_get('xdebug.remote_port'):9000;
 
-    print 'XDEBUG_SERVER: '.$address."<br>\n";
-    print 'XDEBUG_PORT: '.$port."<br>\n";
+    print "<strong>Current xdebug setup:</strong><br>\n";
+    print 'xdebug.remote_host = '.$address."<br>\n";
+    print 'xdebug.remote_port = '.$port."<br>\n";
+    print 'xdebug.profiler_output_dir = '.ini_get('xdebug.profiler_output_dir')."<br>\n";
+    print 'xdebug.profiler_enable = '.ini_get('xdebug.profiler_enable')."<br>\n";
+    print 'xdebug.profiler_enable_trigger = '.ini_get('xdebug.profiler_enable_trigger')."<br>\n";
     print "<br>\n";
+
+    print "<strong>Test debugger server (Eclipse for example):</strong><br>\n";
     $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     if (empty($socket)) die('Unable to prepare a socket');
     //socket_bind($sock, $address, $port) or die('Unable to bind on address='.$address.' port='.$port);
@@ -66,29 +72,29 @@ if (function_exists('socket_create'))
         echo "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
         echo "There is a Remote debug server at this address.<br>\n";
         echo "<br>\n";
-        echo "To be sure this debugger accepts input from your PHP server, be sure to have\n";
+        echo "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
         echo "your php.ini file with this :<br>\n";
-        echo 'xdebug.remote_enable=on<br>
-              xdebug.remote_handle=dbgp<br>
-              xdebug.remote_host=localhost<br>
-              xdebug.remote_port=9000<br>
-              xdebug.profiler_enable=0<br>
-              xdebug.profiler_enable_trigger=1<br>
-              xdebug.show_local_vars=off<br>
-              xdebug.profiler_output_dir=/tmp/xdebug<br>
-              xdebug.profiler_append=0<br>
-              <br>
-              xdebug.trace_enable_trigger=1<br>
-              xdebug.show_mem_delta=1<br>
-              xdebug.trace_output_dir=/tmp/trace<br>
-              xdebug.auto_trace=0<br>
-	    '."\n";
-        print "<br>\n";
+        echo '<textarea cols="80" rows="16">'."xdebug.remote_enable=on
+xdebug.remote_handle=dbgp
+xdebug.remote_host=localhost
+xdebug.remote_port=9000
+xdebug.profiler_enable=0
+xdebug.profiler_enable_trigger=1
+xdebug.show_local_vars=off
+xdebug.profiler_output_dir=/tmp/xdebug
+xdebug.profiler_append=0
+; for xdebug 2.2+
+xdebug.trace_enable_trigger=1
+xdebug.show_mem_delta=1
+xdebug.trace_output_dir=/tmp/trace
+xdebug.auto_trace=0
+</textarea>\n";
+        print "<br><br>\n";
         echo 'Then check in your debug server (Eclipse), you have setup:<br>
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
         print "<br>\n";
-        echo "Then, to run a debug session, add parameter XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.\n";
+        echo "Then, to run a debug session (when xdebug.profiler_enable_trigger=1), add parameter XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.\n";
     }
     else
     {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 645580621e3..ae4d11548aa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1269,7 +1269,7 @@ PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
 NotInstalled=Not installed, so your server is not slow down by this.
 ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server. More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note that a lot of web hosting provider does not provide such cache server. 
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server. 
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). 
 HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)