diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index c6954619..73a582ec 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,7 +1,7 @@
-AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 028fbcf18b297c3abe529a7bce3ce6d86a7ae3b3 SHA1 de83bf6464f4d3faf73ced0903c9acf400238608 SHA256 b4aac7d935a83690c70445d4bb2b8283b4af30706e492e6c14aacccaa21ae44e
-MD5 30dde1357124332b35df0cd2494f83d4 files/apr-util-1.2.10-mozldap60-2.patch 4251
-RMD160 028fbcf18b297c3abe529a7bce3ce6d86a7ae3b3 files/apr-util-1.2.10-mozldap60-2.patch 4251
-SHA256 b4aac7d935a83690c70445d4bb2b8283b4af30706e492e6c14aacccaa21ae44e files/apr-util-1.2.10-mozldap60-2.patch 4251
+AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c SHA1 1ee53d4de45c6dbc470ba3c2c408161fb16d1412 SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e
+MD5 f94b943915818150fb655d1fcd5beb07 files/apr-util-1.2.10-mozldap60-2.patch 4251
+RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c files/apr-util-1.2.10-mozldap60-2.patch 4251
+SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e files/apr-util-1.2.10-mozldap60-2.patch 4251
 AUX apr-util-1.2.8-mozldap60-1.patch 1141 RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 SHA1 de18b668862129214e8a101c0ea006398b35fb56 SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee
 MD5 1b69c0ee68c2f100dc9b77a5549c8079 files/apr-util-1.2.8-mozldap60-1.patch 1141
 RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 files/apr-util-1.2.8-mozldap60-1.patch 1141
diff --git a/dev-libs/apr-util/files/apr-util-1.2.10-mozldap60-2.patch b/dev-libs/apr-util/files/apr-util-1.2.10-mozldap60-2.patch
index 9b28843a..80de4076 100644
--- a/dev-libs/apr-util/files/apr-util-1.2.10-mozldap60-2.patch
+++ b/dev-libs/apr-util/files/apr-util-1.2.10-mozldap60-2.patch
@@ -24,7 +24,7 @@ also check if ber_init is present in libldap60
 +    AC_CHECK_LIB(${lberlib}, ber_init, 
 +      [
 +        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${lberlib} ${extralib}])
-+        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
++        APR_ADDTO(APRUTIL_LIBS,[-l${lberlib} ${extralib}])
 +        apu_has_lber="1";
 +      ], , ${extralib})
 +  fi
@@ -43,7 +43,7 @@ also check if ber_init is present in libldap60
 +    AC_CHECK_LIB(${lberlib}, ber_init, 
 +      [
 +        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${lberlib} ${extralib}])
-+        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
++        APR_ADDTO(APRUTIL_LIBS,[-l${lberlib} ${extralib}])
 +        apu_has_lber="1";
 +      ], , ${extralib})
 +  fi
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 6eb9e836..df76b747 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,9 +1,9 @@
 DIST gentoo-apache-2.2.6-r99-20070921.tar.bz2 58066 RMD160 85285c079b6e975c2bfcd8b8ed8070ae6f8ee7cb SHA1 fb3f091b2e5a3cfab912535c50b5286bd65b813a SHA256 d10754cb517ea68a717e5da6bb5897b103a3e5ac864e99ada8e35c69e1da9c89
 DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
-EBUILD apache-2.2.6-r99.ebuild 16204 RMD160 9480990a4fb5a919f6d7dfbf1713ccf0943c8d48 SHA1 290352a4cb166600cec4b50c14ef8f110d729d09 SHA256 51edf90b89cba91ed7bf37334bb776efa0e0d83c218cae1e9ab1c9bff532cc4d
-MD5 6cc34b32a3c6eb84a86a539ef77a5587 apache-2.2.6-r99.ebuild 16204
-RMD160 9480990a4fb5a919f6d7dfbf1713ccf0943c8d48 apache-2.2.6-r99.ebuild 16204
-SHA256 51edf90b89cba91ed7bf37334bb776efa0e0d83c218cae1e9ab1c9bff532cc4d apache-2.2.6-r99.ebuild 16204
+EBUILD apache-2.2.6-r99.ebuild 16198 RMD160 c65320efc11db2097567991a198981c7446284b6 SHA1 bcad52bbb6ef4fb2280ae80c2b2d1362540f1580 SHA256 be5295da5ede9286b52b2a1f8e167a13814b21abef6d5759fe2ec13abde4e6d4
+MD5 ec61850f97c4061bf1e91de3947bddcd apache-2.2.6-r99.ebuild 16198
+RMD160 c65320efc11db2097567991a198981c7446284b6 apache-2.2.6-r99.ebuild 16198
+SHA256 be5295da5ede9286b52b2a1f8e167a13814b21abef6d5759fe2ec13abde4e6d4 apache-2.2.6-r99.ebuild 16198
 MISC ChangeLog 240 RMD160 ae237e5195383d0c8727e403ce1b6b0858dfff87 SHA1 77a17dace2739855ac792de52af644ee7cbe1929 SHA256 6466927d71492110e673e730eb63d67d551a740643ca3edca5367e9d8bb93b55
 MD5 121293941f84df24ffcdd20d8b9510fb ChangeLog 240
 RMD160 ae237e5195383d0c8727e403ce1b6b0858dfff87 ChangeLog 240
diff --git a/www-servers/apache/apache-2.2.6-r99.ebuild b/www-servers/apache/apache-2.2.6-r99.ebuild
index 502b5c22..9c1a1b07 100644
--- a/www-servers/apache/apache-2.2.6-r99.ebuild
+++ b/www-servers/apache/apache-2.2.6-r99.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
-		http://ftp.mars.arge.at/fedora-ds/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+		http://ftp.mars.arge.at/pub/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
 
 # some helper scripts are apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"