diff --git a/www/php4/extensions/Makefile b/www/php4/extensions/Makefile
index 03f88789115..30317f934fd 100644
--- a/www/php4/extensions/Makefile
+++ b/www/php4/extensions/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2007/10/21 09:43:22 espie Exp $
+# $OpenBSD: Makefile,v 1.58 2007/10/30 10:13:05 ajacoutot Exp $
 
 FULLPKGNAME-main=	php4-extensions-${V}p1
 COMMENT-main=	informational package about PHP4 extensions
@@ -151,7 +151,7 @@ MULTI_PACKAGES+=	-imap
 COMMENT-imap=		imap, pop3 and nntp extensions for php4
 CONFIGURE_ARGS+=	--with-imap=shared,${LOCALBASE} \
 			--with-kerberos=/usr --with-imap-ssl
-LIB_DEPENDS-imap=	c-client.>=3::mail/c-client
+LIB_DEPENDS-imap=	c-client.>=5::mail/imap-uw,-c-client
 WANTLIB-imap=		${WANTLIB} des gssapi crypto krb5 ssl
 .endif
 
@@ -313,6 +313,8 @@ RUN_DEPENDS${i}=	:php4-core-${V}:www/php4/core
 MODULE_NAME${i}=	${i:S/-//g}
 .endfor
 
+FULLPKGNAME-imap=	php4-imap-$Vp0
+
 MESSAGE=		${PKGDIR}/MESSAGE
 SUBST_VARS=		MODULE_NAME PHP_CONFIG_FILE LOCALBASE V
 
diff --git a/www/php4/extensions/patches/patch-ext_imap_php_imap_c b/www/php4/extensions/patches/patch-ext_imap_php_imap_c
new file mode 100644
index 00000000000..57c82105e17
--- /dev/null
+++ b/www/php4/extensions/patches/patch-ext_imap_php_imap_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-ext_imap_php_imap_c,v 1.1 2007/10/30 10:13:05 ajacoutot Exp $
+--- ext/imap/php_imap.c.orig	Sun Oct 28 00:22:52 2007
++++ ext/imap/php_imap.c	Sun Oct 28 00:23:13 2007
+@@ -71,7 +71,7 @@ static int _php_imap_address_size(ADDRESS *addresslist
+ void rfc822_date(char *date);
+ char *cpystr(const char *str);
+ char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
+-long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
++long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
+ unsigned long find_rightmost_bit(unsigned long *valptr);
+ void fs_give(void **block);
+ void *fs_get(size_t size);
+@@ -2061,7 +2061,7 @@ PHP_FUNCTION(imap_utf8)
+ 	dest.size = 0;
+ 
+ 	cpytxt(&src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+-	utf8_mime2text(&src, &dest);
++	utf8_mime2text(&src, &dest, U8T_CANONICAL);
+ 	RETURN_STRINGL(dest.data, strlen(dest.data), 1);
+ }
+ /* }}} */