--- apache-2.0.51.ebuild	2004-09-17 02:36:12.000000000 -0600
+++ apache-2.0.51-r1.ebuild	2004-09-20 16:56:48.115669232 -0600
@@ -9,7 +9,7 @@
 DESCRIPTION="Apache Web Server, Version 2.0.x"
 HOMEPAGE="http://www.apache.org/"
 SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
-	http://dev.gentoo.org/~stuart/apache/apache-patches-${PVR}.tar.bz2"
+	http://dev.gentoo.org/~stuart/apache/apache-patches-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="2"
@@ -52,7 +52,8 @@
 	# patches?
 
 	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
+	epatch ${WORKDIR}/apache-patches-${PV} || die
+	epatch ${FILESDIR}/patches/${PVR}/00_satisfy_merge.patch || die
 
 	if use berkdb; then
 		einfo "Enabling berkdb."