diff --git a/net/pear-XML_RPC/Makefile b/net/pear-XML_RPC/Makefile
index 8f1ee27ff50d..fd7b9f63f44e 100644
--- a/net/pear-XML_RPC/Makefile
+++ b/net/pear-XML_RPC/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML_RPC
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.4
 CATEGORIES=	net devel pear
 
 MAINTAINER=	miwi@FreeBSD.org
@@ -17,15 +17,12 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	xml
 
+PEAR_CATSRC=	yes
 CATEGORY=	XML
 FILES=		RPC.php RPC/Server.php RPC/Dump.php
 TESTS=		allgot.inc empty-value-struct.php empty-value.php \
 		extra-lines.php protoport.php test_Dump.php types.php
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/RPC
-	@${MV} ${WRKSRC}/Server.php ${WRKSRC}/Dump.php ${WRKSRC}/RPC
-
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-XML_RPC/distinfo b/net/pear-XML_RPC/distinfo
index 14abe0b2930a..2e7237049a24 100644
--- a/net/pear-XML_RPC/distinfo
+++ b/net/pear-XML_RPC/distinfo
@@ -1,3 +1,2 @@
-MD5 (PEAR/XML_RPC-1.5.3.tgz) = d7b0272564f05491f8d2c2de1707ee80
-SHA256 (PEAR/XML_RPC-1.5.3.tgz) = 091ab56da474d20d6c8aec080b81c3e908afc726bbb1eb67b24e5f97b722459f
-SIZE (PEAR/XML_RPC-1.5.3.tgz) = 31717
+SHA256 (PEAR/XML_RPC-1.5.4.tgz) = c76babd9c5c56098c8e2659f2cff470f42688675d2adb2bc9aa6810a75bff611
+SIZE (PEAR/XML_RPC-1.5.4.tgz) = 31671