diff --git a/converters/p5-Encode-IMAPUTF7/Makefile b/converters/p5-Encode-IMAPUTF7/Makefile
index c0a081fe595..28a0583fc3f 100644
--- a/converters/p5-Encode-IMAPUTF7/Makefile
+++ b/converters/p5-Encode-IMAPUTF7/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/01/25 23:02:40 simon Exp $
+# $OpenBSD: Makefile,v 1.2 2009/05/03 19:57:42 simon Exp $
 
 COMMENT =	modification of UTF-7 encoding for IMAP
 
-DISTNAME =	Encode-IMAPUTF7-1.00
+DISTNAME =	Encode-IMAPUTF7-1.03
 CATEGORIES =	converters
 MODULES =	cpan
 
@@ -14,4 +14,6 @@ PERMIT_PACKAGE_FTP =		Yes
 PERMIT_DISTFILES_CDROM =	Yes
 PERMIT_DISTFILES_FTP =		Yes
 
+REGRESS_DEPENDS =	::devel/p5-Test-NoWarnings
+
 .include <bsd.port.mk>
diff --git a/converters/p5-Encode-IMAPUTF7/distinfo b/converters/p5-Encode-IMAPUTF7/distinfo
index bece69636a6..8939f87458f 100644
--- a/converters/p5-Encode-IMAPUTF7/distinfo
+++ b/converters/p5-Encode-IMAPUTF7/distinfo
@@ -1,5 +1,5 @@
-MD5 (Encode-IMAPUTF7-1.00.tar.gz) = QN4zAKxQ+Y3OPJFaCgxQxg==
-RMD160 (Encode-IMAPUTF7-1.00.tar.gz) = xN5+M0HybFBoe7Y+C9SZ1Fs+5aI=
-SHA1 (Encode-IMAPUTF7-1.00.tar.gz) = hLPg1Hdga0vCMNJerA/czxmX+Tg=
-SHA256 (Encode-IMAPUTF7-1.00.tar.gz) = XTxRFkb2y/y4Y+1Pmu/IM2IbL/jD/2DsUT+QdtKTqsE=
-SIZE (Encode-IMAPUTF7-1.00.tar.gz) = 25871
+MD5 (Encode-IMAPUTF7-1.03.tar.gz) = +UDBBxs0vOIqbi8uSLW91w==
+RMD160 (Encode-IMAPUTF7-1.03.tar.gz) = Zi6jY4Gx20FY7/V08ZYT18FX7Lw=
+SHA1 (Encode-IMAPUTF7-1.03.tar.gz) = 8ndlgnkkaqYmgajbaJDl9c5HsbA=
+SHA256 (Encode-IMAPUTF7-1.03.tar.gz) = zrgteNW7oJ9pUXadNmzJEYe/ZMM2V95S2PBLRX+yhoc=
+SIZE (Encode-IMAPUTF7-1.03.tar.gz) = 25536
diff --git a/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm b/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm
deleted file mode 100644
index 98bb6ad7de2..00000000000
--- a/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lib_Encode_IMAPUTF7_pm,v 1.1.1.1 2009/01/25 23:02:40 simon Exp $
-
-Fix for problem under Perl 5.10 found at
-http://rt.cpan.org/Public/Bug/Display.html?id=40827
-
---- lib/Encode/IMAPUTF7.pm.orig	Sun Jan 25 23:45:28 2009
-+++ lib/Encode/IMAPUTF7.pm	Sun Jan 25 23:46:20 2009
-@@ -36,7 +36,8 @@ sub encode($$;$){
- 	    if ($1 eq "&"){
- 		$bytes .= "&-";
- 	    }else{
--		my $base64 = encode_base64($e_utf16->encode($1), '');
-+		my $s = $1;
-+		my $base64 = encode_base64($e_utf16->encode($s), '');
- 		$base64 =~ s/=+$//;
-                 $base64 =~ s/\//,/g;
- 		$bytes .= "&$base64-";