diff --git a/ChangeLog b/ChangeLog
index feefa80c1a..67d43b5e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
 - bug #3374374 [interface] Fix footnote for inexact count while browsing
 - bug #3372807 [interface] Fix security warning link in setup
 - bug #3374347 [display] Backquotes in normal text on import page
+- bug #3358750 [core] With Suhosin, urls are too long in edit links
 
 3.4.3.2 (2011-07-23)
 - [security] Fixed XSS vulnerability, see PMASA-2011-9
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 5762531d73..edf0264361 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2635,8 +2635,11 @@ $cfg['CheckConfigurationPermissions'] = true;
  * Limit for length of URL in links. When length would be above this limit, it
  * is replaced by form with button.
  * This is required as some web servers (IIS) have problems with long URLs.
+ * The recommended limit is 2000 
+ * (see http://www.boutell.com/newfaq/misc/urllength.html) but we put
+ * 1000 to accommodate Suhosin, see bug #3358750.
  */
-$cfg['LinkLengthLimit'] = 2000;
+$cfg['LinkLengthLimit'] = 1000;
 
 /**
  * Disable the table maintenance mass operations, like optimizing or