diff --git a/ChangeLog b/ChangeLog
index 23a468ff1..52370e54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2980582 [interface] Properly format server status parameter.
 - bug #2973949 [session] SQL History broken (revert patch #2899969),
   thanks to Dieter Adriaenssens - ruleant
+- [doc] Be more specific about problems with Suhosin.
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/Documentation.html b/Documentation.html
index 6331684dc..070b3e1d2 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3059,10 +3059,18 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 </p>
 <p>
     Suhosin configuration might lead to malfunction in some cases and it can
-    not be fully obeyed as phpMyAdmin is kind of application which needs to
+    not be fully avoided as phpMyAdmin is kind of application which needs to
     transfer big amounts of fields in single HTTP request, what is something
-    what Suhosin tries to prevent. If you have problems, please adjust at
-    least following parameters:
+    what Suhosin tries to prevent. Generally all
+    <code>suhosin.request.*</code>, <code>suhosin.post.*</code> and
+    <code>suhosin.get.*</code> directives can have negative effect on
+    phpMyAdmin usability. You can always find in your error logs which limit
+    did cause dropping of variable, so you can diagnose the problem and adjust
+    matching configuration variable.
+</p>
+<p>
+    The default values for most Suhosin configuration options will work in most 
+    scenarios, however you might want to adjust at least following parameters:
 </p>
 
 <ul>