diff --git a/lang/php4/Makefile.pear b/lang/php4/Makefile.pear
index f4480e1d0936..21fbfcac7dcb 100644
--- a/lang/php4/Makefile.pear
+++ b/lang/php4/Makefile.pear
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	2
 
 LIB_DEPENDS+=   expat.5:${PORTSDIR}/textproc/expat2
 
diff --git a/lang/php4/pkg-plist.pear b/lang/php4/pkg-plist.pear
index 117317321c14..9e0a562ecc98 100644
--- a/lang/php4/pkg-plist.pear
+++ b/lang/php4/pkg-plist.pear
@@ -1,7 +1,7 @@
 bin/pear
-lib/php/pear/.filemap
-lib/php/pear/.lock
 @exec mkdir -p %D/lib/php/pear/.registry
+@exec touch %D/lib/php/pear/.filemap
+@exec touch %D/lib/php/pear/.lock
 share/pear/bootstrap/Archive/Tar.php
 share/pear/bootstrap/PEAR.php
 share/pear/bootstrap/System.php
@@ -33,8 +33,10 @@ share/pear/bootstrap/PEAR/Remote.php
 share/pear/bootstrap/PEAR/RunTest.php
 share/pear/bootstrap/XML/RPC.php
 share/pear/bootstrap/XML/RPC/Server.php
-@dirrm lib/php/pear/.registry
-@dirrm lib/php/pear
+@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true
+@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear 2> /dev/null || true
 @unexec rmdir %D/lib/php 2> /dev/null || true
 @dirrm share/pear/bootstrap/Archive
 @dirrm share/pear/bootstrap/Console
diff --git a/lang/php5/Makefile.pear b/lang/php5/Makefile.pear
index b69f41a26bd1..75ed3861d93d 100644
--- a/lang/php5/Makefile.pear
+++ b/lang/php5/Makefile.pear
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	3
 
 USE_GNOME=	libxml2
 
diff --git a/lang/php5/pkg-plist.pear b/lang/php5/pkg-plist.pear
index 4bb56f13a43d..5d6e41f0a15a 100644
--- a/lang/php5/pkg-plist.pear
+++ b/lang/php5/pkg-plist.pear
@@ -1,7 +1,7 @@
 bin/pear
-lib/php/pear/.filemap
-lib/php/pear/.lock
 @exec mkdir -p %D/lib/php/pear/.registry
+@exec touch %D/lib/php/pear/.filemap
+@exec touch %D/lib/php/pear/.lock
 share/pear/bootstrap/Archive/Tar.php
 share/pear/bootstrap/PEAR.php
 share/pear/bootstrap/System.php
@@ -34,8 +34,10 @@ share/pear/bootstrap/PEAR/Remote.php
 share/pear/bootstrap/PEAR/RunTest.php
 share/pear/bootstrap/XML/RPC.php
 share/pear/bootstrap/XML/RPC/Server.php
-@dirrm lib/php/pear/.registry
-@dirrm lib/php/pear
+@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true
+@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear 2> /dev/null || true
 @unexec rmdir %D/lib/php 2> /dev/null || true
 @dirrm share/pear/bootstrap/Archive
 @dirrm share/pear/bootstrap/Console
diff --git a/lang/php53/Makefile.pear b/lang/php53/Makefile.pear
index b69f41a26bd1..75ed3861d93d 100644
--- a/lang/php53/Makefile.pear
+++ b/lang/php53/Makefile.pear
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	3
 
 USE_GNOME=	libxml2
 
diff --git a/lang/php53/pkg-plist.pear b/lang/php53/pkg-plist.pear
index 4bb56f13a43d..5d6e41f0a15a 100644
--- a/lang/php53/pkg-plist.pear
+++ b/lang/php53/pkg-plist.pear
@@ -1,7 +1,7 @@
 bin/pear
-lib/php/pear/.filemap
-lib/php/pear/.lock
 @exec mkdir -p %D/lib/php/pear/.registry
+@exec touch %D/lib/php/pear/.filemap
+@exec touch %D/lib/php/pear/.lock
 share/pear/bootstrap/Archive/Tar.php
 share/pear/bootstrap/PEAR.php
 share/pear/bootstrap/System.php
@@ -34,8 +34,10 @@ share/pear/bootstrap/PEAR/Remote.php
 share/pear/bootstrap/PEAR/RunTest.php
 share/pear/bootstrap/XML/RPC.php
 share/pear/bootstrap/XML/RPC/Server.php
-@dirrm lib/php/pear/.registry
-@dirrm lib/php/pear
+@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true
+@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/lib/php/pear 2> /dev/null || true
 @unexec rmdir %D/lib/php 2> /dev/null || true
 @dirrm share/pear/bootstrap/Archive
 @dirrm share/pear/bootstrap/Console