diff --git a/reference/info/functions/set-time-limit.xml b/reference/info/functions/set-time-limit.xml
index dd7784854a..8662b3e49f 100644
--- a/reference/info/functions/set-time-limit.xml
+++ b/reference/info/functions/set-time-limit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/info.xml, last change in rev 1.72 -->
   <refentry id="function.set-time-limit">
    <refnamediv>
@@ -27,11 +27,13 @@
      such as set_time_limit(20) is made, the script will run for a
      total of 45 seconds before timing out.
     </simpara>
-    <simpara>
-     <function>set_time_limit</function> has no effect when PHP is
-     running in &safemode;. There is no workaround other than turning
-     off safe mode or changing the time limit in the &php.ini;.
-    </simpara>
+    <warning>
+     <para>
+      <function>set_time_limit</function> has no effect when PHP is
+      running in &safemode;. There is no workaround other than turning
+      off safe mode or changing the time limit in the &php.ini;.
+     </para>
+    </warning>
     <note>
      <para>
       The <function>set_time_limit</function> function and the
diff --git a/reference/info/ini.xml b/reference/info/ini.xml
index cc155373cc..228f841299 100644
--- a/reference/info/ini.xml
+++ b/reference/info/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <section id="info.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -175,6 +175,11 @@
       <function>set_time_limit</function> function for more
       details.
      </para>
+     <para>
+      You can not change this setting with <function>ini_set</function> when
+      running in &safe_mode;. The only workaround is to turn off safe mode or
+      by changing the time limit in the &php.ini;.
+     </para>
     </listitem>
    </varlistentry>