diff --git a/src/Client.php b/src/Client.php
index 98cab68cd6..e3ec72df9d 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -16,7 +16,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter.php b/src/Client/Adapter.php
index ca1ad31318..bbbb3cefad 100644
--- a/src/Client/Adapter.php
+++ b/src/Client/Adapter.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
index 487866ddad..4a6f21b9c7 100644
--- a/src/Client/Adapter/Curl.php
+++ b/src/Client/Adapter/Curl.php
@@ -16,7 +16,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Exception.php b/src/Client/Adapter/Exception.php
index 3bf9821db2..e78dfda942 100644
--- a/src/Client/Adapter/Exception.php
+++ b/src/Client/Adapter/Exception.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter_Exception
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
index 31ab5eef3c..4b58ca5e01 100644
--- a/src/Client/Adapter/Proxy.php
+++ b/src/Client/Adapter/Proxy.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
index d4f3f43ab3..f2073e696a 100644
--- a/src/Client/Adapter/Socket.php
+++ b/src/Client/Adapter/Socket.php
@@ -16,7 +16,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Stream.php b/src/Client/Adapter/Stream.php
index 3fcc35b86a..943dd8f18f 100644
--- a/src/Client/Adapter/Stream.php
+++ b/src/Client/Adapter/Stream.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
index a26de81c5e..342d6bc6d9 100644
--- a/src/Client/Adapter/Test.php
+++ b/src/Client/Adapter/Test.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Client/Exception.php b/src/Client/Exception.php
index 3af4578af9..72e77a6854 100644
--- a/src/Client/Exception.php
+++ b/src/Client/Exception.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Exception
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Cookie.php b/src/Cookie.php
index bd75deef61..17a007364c 100644
--- a/src/Cookie.php
+++ b/src/Cookie.php
@@ -17,7 +17,6 @@
  * @package    Zend_Http
  * @subpackage Cookie
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id$
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
diff --git a/src/CookieJar.php b/src/CookieJar.php
index f26a815a18..9243c8eba4 100644
--- a/src/CookieJar.php
+++ b/src/CookieJar.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage CookieJar
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Exception.php b/src/Exception.php
index 02fadd8599..6577cf0873 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Exception
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Response.php b/src/Response.php
index 112c7f3ed1..78b5680143 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Response
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/src/Response/Stream.php b/src/Response/Stream.php
index 3bff9bd8bd..94dac28c34 100644
--- a/src/Response/Stream.php
+++ b/src/Response/Stream.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Response
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
index 27f6f2ecf1..0fc07383d0 100644
--- a/test/Client/CommonHttpTests.php
+++ b/test/Client/CommonHttpTests.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/CurlTest.php b/test/Client/CurlTest.php
index 00390cb9de..400c5b41b3 100644
--- a/test/Client/CurlTest.php
+++ b/test/Client/CurlTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/ProxyAdapterTest.php b/test/Client/ProxyAdapterTest.php
index 5007bfb026..5650d59526 100644
--- a/test/Client/ProxyAdapterTest.php
+++ b/test/Client/ProxyAdapterTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/SocketKeepaliveTest.php b/test/Client/SocketKeepaliveTest.php
index 3e5b99d334..307203b4d1 100644
--- a/test/Client/SocketKeepaliveTest.php
+++ b/test/Client/SocketKeepaliveTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/SocketPersistentTest.php b/test/Client/SocketPersistentTest.php
index b5ee90bf40..271a667cc7 100644
--- a/test/Client/SocketPersistentTest.php
+++ b/test/Client/SocketPersistentTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/SocketTest.php b/test/Client/SocketTest.php
index 53bffb5236..251cff7b9a 100644
--- a/test/Client/SocketTest.php
+++ b/test/Client/SocketTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/StaticTest.php b/test/Client/StaticTest.php
index 45dedd4884..de0a02ddf4 100644
--- a/test/Client/StaticTest.php
+++ b/test/Client/StaticTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/TestAdapterTest.php b/test/Client/TestAdapterTest.php
index 7484b6cf31..7afbfc4600 100644
--- a/test/Client/TestAdapterTest.php
+++ b/test/Client/TestAdapterTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/_files/testCookies.php b/test/Client/_files/testCookies.php
index 6422a3833e..aad9442bf7 100644
--- a/test/Client/_files/testCookies.php
+++ b/test/Client/_files/testCookies.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 echo serialize($_COOKIE);
diff --git a/test/Client/_files/testExceptionOnReadTimeout.php b/test/Client/_files/testExceptionOnReadTimeout.php
index a3f570e82f..b1757baee9 100644
--- a/test/Client/_files/testExceptionOnReadTimeout.php
+++ b/test/Client/_files/testExceptionOnReadTimeout.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Client/_files/testGetData.php b/test/Client/_files/testGetData.php
index 237adfb825..e644908250 100644
--- a/test/Client/_files/testGetData.php
+++ b/test/Client/_files/testGetData.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 echo serialize($_GET);
diff --git a/test/Client/_files/testHttpAuth.php b/test/Client/_files/testHttpAuth.php
index 8d07eba0ec..59191a6939 100644
--- a/test/Client/_files/testHttpAuth.php
+++ b/test/Client/_files/testHttpAuth.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 $user = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : null;
diff --git a/test/Client/_files/testMultibyteChunkedResponseZF6218.php b/test/Client/_files/testMultibyteChunkedResponseZF6218.php
index d5a29005d5..e58a2d005e 100644
--- a/test/Client/_files/testMultibyteChunkedResponseZF6218.php
+++ b/test/Client/_files/testMultibyteChunkedResponseZF6218.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 header("Content-type: text/plain; charset=UTF-8");
diff --git a/test/Client/_files/testPostData.php b/test/Client/_files/testPostData.php
index 133fbfc8a3..332b20c19e 100644
--- a/test/Client/_files/testPostData.php
+++ b/test/Client/_files/testPostData.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 echo serialize($_POST);
diff --git a/test/Client/_files/testRawPostData.php b/test/Client/_files/testRawPostData.php
index 2dd6f33d5c..44a862753d 100644
--- a/test/Client/_files/testRawPostData.php
+++ b/test/Client/_files/testRawPostData.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 readfile('php://input');
diff --git a/test/Client/_files/testRedirections.php b/test/Client/_files/testRedirections.php
index aa63dfd460..ee559b2c3a 100644
--- a/test/Client/_files/testRedirections.php
+++ b/test/Client/_files/testRedirections.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 if (! isset($_GET['redirection'])) $_GET['redirection'] = 0;
diff --git a/test/Client/_files/testRelativeRedirections.php b/test/Client/_files/testRelativeRedirections.php
index 8d482acf8d..33e1df91df 100644
--- a/test/Client/_files/testRelativeRedirections.php
+++ b/test/Client/_files/testRelativeRedirections.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 if (! isset($_GET['redirect'])) $_GET['redirect'] = null;
diff --git a/test/Client/_files/testResetParameters.php b/test/Client/_files/testResetParameters.php
index 5dbf7d0d1d..373f8ee38c 100644
--- a/test/Client/_files/testResetParameters.php
+++ b/test/Client/_files/testResetParameters.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 echo serialize($_GET) . "\n" . serialize($_POST);
diff --git a/test/Client/_files/testStreamRequest.php b/test/Client/_files/testStreamRequest.php
index d205a674d9..44a862753d 100644
--- a/test/Client/_files/testStreamRequest.php
+++ b/test/Client/_files/testStreamRequest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: testRawPostData.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 readfile('php://input');
diff --git a/test/Client/_files/testUploads.php b/test/Client/_files/testUploads.php
index 48fc8d9832..85ba0eb8b9 100644
--- a/test/Client/_files/testUploads.php
+++ b/test/Client/_files/testUploads.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 if (! empty($_FILES)) {
diff --git a/test/CookieJarTest.php b/test/CookieJarTest.php
index eaed89ac8a..a7090fe344 100644
--- a/test/CookieJarTest.php
+++ b/test/CookieJarTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/CookieTest.php b/test/CookieTest.php
index 9ba88039ec..4808b0329c 100644
--- a/test/CookieTest.php
+++ b/test/CookieTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
index 021d2bb13c..48253e0b56 100644
--- a/test/ResponseTest.php
+++ b/test/ResponseTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**