diff --git a/NEWS b/NEWS
index 52134e63000..6fb0b594d88 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2005, PHP 5.1 Release Candidate 1
+- Unbundled XML_RPC pear class and force ext/xmlrpc dependency on pear (Rasmus)
 - Updated bundled libraries in Windows distribution. (Edin)
   . zlib 1.2.3
   . curl 7.14.0
diff --git a/configure.in b/configure.in
index a99eab8f486..ac5a97ac690 100644
--- a/configure.in
+++ b/configure.in
@@ -874,15 +874,10 @@ if test "$PHP_PEAR" != "no"; then
     pear_error_msg="$pear_error_msg 
                     PEAR requires XML to be enabled.     Add --enable-xml to the configure line. (or --without-pear)"
   fi
-
-dnl
-dnl ext/xmlrpc is not really there yet to be a requirement..
-dnl
-dnl  if test "$PHP_XMLRPC" = "no"; then
-dnl    pear_error_msg="$pear_error_msg 
-dnl                    PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)"
-dnl fi
-dnl
+  if test "$PHP_XMLRPC" = "no"; then
+    pear_error_msg="$pear_error_msg 
+                    PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)"
+  fi
 
   if test "$pear_error_msg"; then
     AC_MSG_ERROR([$pear_error_msg])
diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php
index c75b11b5c19..1da25f08153 100644
--- a/pear/PEAR/Remote.php
+++ b/pear/PEAR/Remote.php
@@ -115,9 +115,8 @@ class PEAR_Remote extends PEAR
                 $this->saveCache($_args, $result);
             };
             return $result;
-        }
-        if (!@include_once("XML/RPC.php")) {
-            return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
+        } else {
+            return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension");
         }
         array_shift($args);
         $server_host = $this->config->get('master_server');
diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php
index 881fcf616b2..e23646b8792 100755
--- a/pear/go-pear-list.php
+++ b/pear/go-pear-list.php
@@ -8,7 +8,6 @@
 $packages  = array(
 // required packages for the installer
 "PEAR"                  =>    "1.3.5",
-"XML_RPC"               =>    "1.3.1",
 "Console_Getopt"        =>    "1.2",
 "Archive_Tar"           =>    "1.3.1",
 
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index acab881498f..5d4e292b502 100644
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -124,7 +124,7 @@
       <dep type="php" rel="ge" version="4.2"/>
       <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep>
       <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep>
-      <dep type="pkg" rel="ge" version="1.0.4">XML_RPC</dep>
+      <dep type="ext" rel="has">xmlrpc</dep>
       <dep type="ext" rel="has">xml</dep>
       <dep type="ext" rel="has">pcre</dep>
     </deps>
diff --git a/pear/packages/XML_RPC-1.3.1.tar b/pear/packages/XML_RPC-1.3.1.tar
deleted file mode 100644
index 8fe279b51fa..00000000000
Binary files a/pear/packages/XML_RPC-1.3.1.tar and /dev/null differ
diff --git a/pear/tests/PEAR_test_mock_pearweb.php.inc b/pear/tests/PEAR_test_mock_pearweb.php.inc
index f1f7edc9c1a..11cb0cc25cb 100644
--- a/pear/tests/PEAR_test_mock_pearweb.php.inc
+++ b/pear/tests/PEAR_test_mock_pearweb.php.inc
@@ -1,5 +1,4 @@
 <?php
-require_once 'XML/RPC/Server.php';
 
 class PEAR_test_mock_pearweb {
     var $_config;
@@ -231,4 +230,4 @@ class PEAR_test_mock_pearweb {
         return $newval;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pear/tests/download_test_classes.php.inc b/pear/tests/download_test_classes.php.inc
index c27696d48c8..0341a286116 100644
--- a/pear/tests/download_test_classes.php.inc
+++ b/pear/tests/download_test_classes.php.inc
@@ -1,5 +1,4 @@
 <?php
-require_once 'XML/RPC.php';
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'PEAR_test_mock_pearweb.php.inc';
 $GLOBALS['pearweb'] = new PEAR_test_mock_pearweb;
 class test_XML_RPC_Client extends XML_RPC_Client {
@@ -94,8 +93,8 @@ class test_PEAR_Remote extends PEAR_Remote {
             };
             return $result;
         }
-        if (!@include_once("XML/RPC.php")) {
-            return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
+        if (!extension_loaded("xmlrpc")) {
+            return $this->raiseError("For this remote PEAR operation you need to install the xmlrpc extension");
         }
         array_shift($args);
         $server_host = $this->_registry->channelInfo($server_channel, 'server');
@@ -401,4 +400,4 @@ class test_PEAR_Downloader extends PEAR_Downloader {
         return $dest_file;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pear/tests/package-PEARtests.xml b/pear/tests/package-PEARtests.xml
index daceee967ba..d4e9113fe68 100644
--- a/pear/tests/package-PEARtests.xml
+++ b/pear/tests/package-PEARtests.xml
@@ -22,7 +22,7 @@
       <dep type="pkg" rel="ge" version="1.4.0dev6">PEAR</dep>
       <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep>
       <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep>
-      <dep type="pkg" rel="ge" version="1.1.0">XML_RPC</dep>
+      <dep type="ext" rel="has">xmlrpc</dep>
       <dep type="ext" rel="has">xml</dep>
       <dep type="ext" rel="has">pcre</dep>
     </deps>