diff --git a/features/commandline.xml b/features/commandline.xml
index 99a779b150..b06b91b088 100644
--- a/features/commandline.xml
+++ b/features/commandline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.27 $ -->
+<!-- $Revision: 1.28 $ -->
 <chapter id="features.commandline">
  <title>Using PHP from the command line</title>
  <!-- NEW DOCUMENTATION STARTS -->
@@ -59,13 +59,17 @@
   <filename>php-cli.exe</filename>, living in the same folder as the CGI
   <filename>php.exe</filename>. Starting with PHP 4.3.0 the windows package
   distributes the CLI as <filename>php.exe</filename> in a separate folder
-  named <literal>cli</literal>, so <literal>cli/php.exe</literal>. 
+  named <literal>cli</literal>, so <literal>cli/php.exe</literal>.
+  Starting with PHP 5, the CLI is distributed in the main folder, named
+  <filename>php.exe</filename>. The CGI version is distributed as
+  <filename>php-cgi.exe</filename>.
  </para>
  <para>
-  As of PHP 4.3.5, a new php-win.exe file is distributed. This is equal to the
-  CLI version, except that php-win doesn't output anything and thus as no
-  console (no "dos box" appears on the screen). This method is similar with
-  php-gtk.
+  As of PHP 4.3.5, a new <filename>php-win.exe</filename> file is distributed.
+  This is equal to the CLI version, except that php-win doesn't output
+  anything and thus as no console (no "dos box" appears on the screen). This
+  method is similar with php-gtk. You should configure with
+  <literal>--enable-cli-win32</literal>.
  </para>
  <para>
   <note>