diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index b2fae70513..01c0fcd4f2 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -32,12 +32,6 @@ if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_
 {
 	die("eGroupWare requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
 }
-// check if eGW's pear repository is installed and prefer it over the other ones
-if (is_dir(EGW_SERVER_ROOT.'/egw-pear'))
-{
-	set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
-	//echo "<p align=right>include_path='".get_include_path()."'</p>\n";
-}
 
 if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC);	// this is to support the header upgrade
 
diff --git a/phpgwapi/inc/horde/lib/core.php b/phpgwapi/inc/horde/lib/core.php
index e3c12cfef9..13454b6b28 100644
--- a/phpgwapi/inc/horde/lib/core.php
+++ b/phpgwapi/inc/horde/lib/core.php
@@ -30,7 +30,7 @@ if (!defined('HORDE_BASE')) {
     @define('HORDE_BASE', EGW_BASE . '/phpgwapi/inc/horde/');
 }
 
-$save_include_path = set_include_path(HORDE_BASE . PATH_SEPARATOR . EGW_BASE . '/egw-pear/' . PATH_SEPARATOR . get_include_path());
+$save_include_path = set_include_path(HORDE_BASE . PATH_SEPARATOR . get_include_path());
 /* PEAR base class. */
 include_once 'PEAR.php';
 
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index f83ef34bfb..6a07aa9e5c 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -59,12 +59,6 @@ $setup_info['phpgwapi']['hooks']['addgroup']		= 'phpgwapi.vfs_home_hooks.addGrou
 $setup_info['phpgwapi']['hooks']['deletegroup']		= 'phpgwapi.vfs_home_hooks.deleteGroup';
 $setup_info['phpgwapi']['hooks']['editgroup']		= 'phpgwapi.vfs_home_hooks.editGroup';
 
-// egw-pear dependency for modified HTTP_WebDAV_Server
-$setup_info['phpgwapi']['depends'][] = array(
-	'appname'  => 'egw-pear',
-	'versions' => Array('1.9','14.1')
-);
-
 /* CalDAV/CardDAV/GroupDAV app */
 $setup_info['groupdav']['name']      = 'groupdav';
 $setup_info['groupdav']['version']   = '14.1';
diff --git a/setup/applications.php b/setup/applications.php
index 7e805d6e69..4d7b1ca8dd 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -442,7 +442,7 @@ else
 							$setup_tpl->set_var('resolution','');
 							$status = lang('OK') . ' - ' . $value['status'];
 						}
-						elseif($key != 'egw-pear')
+						else
 						{
 							if ($value['tables'][0] != '')
 							{
diff --git a/setup/check_install.php b/setup/check_install.php
index 5c2d572345..7002ae7d98 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -376,14 +376,8 @@ function pear_check($package,$args)
 	$pear_packages = $channel_packages[(string)$channel];
 	$version_available = false;
 
-	// check if egw-pear is availible and packages is included
-	if ($package && is_dir('../egw-pear') && file_exists('../egw-pear/'.str_replace('_','/',$package).'.php'))
-	{
-		$available = $found = true;
-		$version_available = '999.egw-pear';
-	}
 	// packages found in the pear registry --> use that info
-	elseif ($pear_packages)
+	if ($pear_packages)
 	{
 		$pear_available = $found = true;
 		// check if package is installed
diff --git a/setup/inc/class.setup_cmd_ldap.inc.php b/setup/inc/class.setup_cmd_ldap.inc.php
index e2373e3bba..83ec93a477 100644
--- a/setup/inc/class.setup_cmd_ldap.inc.php
+++ b/setup/inc/class.setup_cmd_ldap.inc.php
@@ -548,8 +548,6 @@ class setup_cmd_ldap extends setup_cmd
 				{
 					if (!isset($emailadmin_src))
 					{
-						// add egw-pear to include_path, as setup does NOT do it (only includes common_functions.inc.php from API)
-						set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
 						include_once(EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$ldap_class.'.inc.php');
 						if ($to_ldap)
 						{
diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index 3a73b55757..a0b4aae5f8 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -52,13 +52,6 @@ if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 
 require_once(EGW_INCLUDE_ROOT . '/phpgwapi/inc/common_functions.inc.php');
 
-// check if eGW's pear repository is installed and prefer it over the regular one
-if (is_dir(EGW_SERVER_ROOT.'/egw-pear'))
-{
-	set_include_path(EGW_SERVER_ROOT.'/egw-pear'.PATH_SEPARATOR.get_include_path());
-	//echo "<p align=right>include_path='".get_include_path()."'</p>\n";
-}
-
 define('SEP',filesystem_separator());
 
 /**
diff --git a/setup/index.php b/setup/index.php
index 0573e827d1..6897d573e1 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -528,7 +528,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
 			}
 		}
 		// warn if essential apps are not installed
-		foreach(array('phpgwapi','etemplate','egw-pear','home','admin','preferences') as $app)
+		foreach(array('phpgwapi','etemplate','home','admin','preferences','emailadmin') as $app)
 		{
 			if (!isset($setup_info[$app]) || empty($setup_info[$app]['currentver']))
 			{