diff --git a/converters/php5-iconv/Makefile b/converters/php5-iconv/Makefile
index c8842b1b4843..37db5b190ff2 100644
--- a/converters/php5-iconv/Makefile
+++ b/converters/php5-iconv/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	converters
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
diff --git a/databases/php5-interbase/Makefile b/databases/php5-interbase/Makefile
index 4d77941c5264..3d1b6573390e 100644
--- a/databases/php5-interbase/Makefile
+++ b/databases/php5-interbase/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
diff --git a/databases/php5-pdo_firebird/Makefile b/databases/php5-pdo_firebird/Makefile
index 91e587b51b2b..5e1b11663e06 100644
--- a/databases/php5-pdo_firebird/Makefile
+++ b/databases/php5-pdo_firebird/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
diff --git a/ftp/php5-curl/Makefile b/ftp/php5-curl/Makefile
index a0db0efe8bde..fa55a453e5a9 100644
--- a/ftp/php5-curl/Makefile
+++ b/ftp/php5-curl/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 CATEGORIES=	ftp
-PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../../lang/php5
 
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 4c3298d77f35..7e3ea7a8762f 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php5
-PORTVERSION=	5.4.24
+PORTVERSION=	5.4.25
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
@@ -23,8 +23,7 @@ USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-CONFIGURE_ARGS=	\
-		--with-layout=GNU \
+CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
@@ -38,7 +37,7 @@ CONFIGURE_ARGS=	\
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE=	CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI IPV6 LINKTHR
+OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 04dd55655e67..f0b4d869fda1 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.24.tar.bz2) = 97fe70eddaf5b93969714a551870fe03f6b0a387f85b83a6d63a40a76199a327
-SIZE (php-5.4.24.tar.bz2) = 12256796
+SHA256 (php-5.4.25.tar.bz2) = b6c18c07c6bf34f75e601b28829d636e44c1c9f4267aac4ed013443c32a2245f
+SIZE (php-5.4.25.tar.bz2) = 11739877
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379