diff --git a/converters/php55-iconv/Makefile b/converters/php55-iconv/Makefile
index f1e0bc34edbc..1727279f21e3 100644
--- a/converters/php55-iconv/Makefile
+++ b/converters/php55-iconv/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	converters
 
 MASTERDIR=	${.CURDIR}/../../lang/php55
diff --git a/databases/php55-interbase/Makefile b/databases/php55-interbase/Makefile
index 2c53f994afff..5ad561868ef4 100644
--- a/databases/php55-interbase/Makefile
+++ b/databases/php55-interbase/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php55
diff --git a/databases/php55-pdo_firebird/Makefile b/databases/php55-pdo_firebird/Makefile
index 73e8e440b77c..13d8dafb9386 100644
--- a/databases/php55-pdo_firebird/Makefile
+++ b/databases/php55-pdo_firebird/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php55
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index 0acaf2d18bd3..f1475d071885 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php55
-PORTVERSION=	5.5.8
+PORTVERSION=	5.5.9
 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/php55/distinfo b/lang/php55/distinfo
index 06c606ff2a76..a2bea54de2a1 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,4 +1,4 @@
-SHA256 (php-5.5.8.tar.bz2) = 6d5f45659d13383fc8429f185cc9da0b30c7bb72dcae9baf568f0511eb7f8b68
-SIZE (php-5.5.8.tar.bz2) = 13005675
+SHA256 (php-5.5.9.tar.bz2) = 9d1dea5195e2bcd928416130a6e19173d02bd36fb76c382522bf145c458fbed3
+SIZE (php-5.5.9.tar.bz2) = 13019443
 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
 SIZE (php-5.5.x-mail-header.patch) = 3379