diff --git a/devel/ZendOptimizer/Makefile b/devel/ZendOptimizer/Makefile
index 4d0585fa7c94..f01738d75c18 100644
--- a/devel/ZendOptimizer/Makefile
+++ b/devel/ZendOptimizer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ZendOptimizer
-PORTVERSION=	2.1.0b
+PORTVERSION=	2.5.0
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}-FreeBSD4.0-i386
 
@@ -38,7 +38,7 @@ ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the source distribution\n\
 manually.\n\
-Please access http://www.zend.com/store/getfreefile.php?pid=13&zbid=547\n\
+Please access http://www.zend.com/store/getfreefile.php?pid=13&zbid=713\n\
 with a web browser, read the license and click the \"I ACCEPT\" button.\n\
 Download the source file, ${DISTNAME}${EXTRACT_SUFX},\n\
 and place it in ${DISTDIR}.\n
@@ -51,6 +51,10 @@ do-install:
 		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer.so
 	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/TS/ZendOptimizer.so \
 		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer_TS.so
+	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager.so \
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
+	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager_TS.so \
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/data/doc/* ${DOCSDIR}
diff --git a/devel/ZendOptimizer/distinfo b/devel/ZendOptimizer/distinfo
index 126d0c272925..1f0cd4507bf8 100644
--- a/devel/ZendOptimizer/distinfo
+++ b/devel/ZendOptimizer/distinfo
@@ -1 +1,2 @@
-MD5 (ZendOptimizer-2.1.0b-FreeBSD4.0-i386.tar.gz) = c022d806f9b78dc09d2193c97f663395
+MD5 (ZendOptimizer-2.5.0-FreeBSD4.0-i386.tar.gz) = 844ed84447719454c6c709610a5cedc5
+SIZE (ZendOptimizer-2.5.0-FreeBSD4.0-i386.tar.gz) = 1980989
diff --git a/devel/ZendOptimizer/pkg-message b/devel/ZendOptimizer/pkg-message
index 29662942367e..4831e2ddef86 100644
--- a/devel/ZendOptimizer/pkg-message
+++ b/devel/ZendOptimizer/pkg-message
@@ -1,4 +1,4 @@
-*****************************************************************************
+********************************************************************************
 
 You have installed the ZendOptimizer package.
 
@@ -6,7 +6,9 @@ Edit %%LOCALBASE%%/etc/php.ini and add:
 
 [Zend]
 zend_optimizer.optimization_level=15
-zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so"
-zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so"
+zend_extension_manager.optimizer="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so"
+zend_extension_manager.optimizer_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so"
+zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager.so"
+zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager_TS.so"
 
-*****************************************************************************
+********************************************************************************
diff --git a/devel/ZendOptimizer/pkg-plist b/devel/ZendOptimizer/pkg-plist
index bdc0b7d2f4bb..cffc74fa9b41 100644
--- a/devel/ZendOptimizer/pkg-plist
+++ b/devel/ZendOptimizer/pkg-plist
@@ -1,3 +1,5 @@
+lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager_TS.so
+lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager.so
 lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so
 lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so
 %%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_TechFAQ.pdf