diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 0dd1d264d804..5676d2e82dfd 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -11,7 +11,6 @@ PKGNAME=	apache+php-${VERSION_APACHE}+${VERSION_PHP}
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		http://www.rge.com/pub/infosystems/apache/dist/ \
-		http://www.php.net/${PHP_DISTDIR}/ \
 		http://us.php.net/${PHP_DISTDIR}/ \
 		http://www.modssl.org/source/ \
 		ftp://ftp.modssl.org/source/ \
@@ -41,6 +40,9 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
+PATCH_SITES=	http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+PATCHFILES=	php4_snmp.c.diff
+
 MAINTAINER=	dirk@FreeBSD.org
 
 BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 8fd915c1c064..4d30051e0ba8 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,4 @@
 MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
 MD5 (mod_ssl-2.4.2-1.3.9.tar.gz) = e30f679aeb4e24f1c4d4cefc6fb10c39
+MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 0ea93b121ec0..47fb3b3e28ab 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -125,7 +125,7 @@ while [ "$1" ]; do
 			echo "PHP_CONF_ARGS+=	--with-ldap=\${PREFIX}"
 			;;
 		\"SNMP\")
-			echo "LIB_DEPENDS+=	snmp.3:\${PORTSDIR}/net/ucd-snmp"
+			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
 			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 0dd1d264d804..5676d2e82dfd 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -11,7 +11,6 @@ PKGNAME=	apache+php-${VERSION_APACHE}+${VERSION_PHP}
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		http://www.rge.com/pub/infosystems/apache/dist/ \
-		http://www.php.net/${PHP_DISTDIR}/ \
 		http://us.php.net/${PHP_DISTDIR}/ \
 		http://www.modssl.org/source/ \
 		ftp://ftp.modssl.org/source/ \
@@ -41,6 +40,9 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
+PATCH_SITES=	http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+PATCHFILES=	php4_snmp.c.diff
+
 MAINTAINER=	dirk@FreeBSD.org
 
 BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 8fd915c1c064..4d30051e0ba8 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,4 @@
 MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
 MD5 (mod_ssl-2.4.2-1.3.9.tar.gz) = e30f679aeb4e24f1c4d4cefc6fb10c39
+MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 0ea93b121ec0..47fb3b3e28ab 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -125,7 +125,7 @@ while [ "$1" ]; do
 			echo "PHP_CONF_ARGS+=	--with-ldap=\${PREFIX}"
 			;;
 		\"SNMP\")
-			echo "LIB_DEPENDS+=	snmp.3:\${PORTSDIR}/net/ucd-snmp"
+			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
 			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")