diff --git a/converters/p5-Encode-IMAPUTF7/Makefile b/converters/p5-Encode-IMAPUTF7/Makefile
new file mode 100644
index 00000000000..c0a081fe595
--- /dev/null
+++ b/converters/p5-Encode-IMAPUTF7/Makefile
@@ -0,0 +1,17 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/01/25 23:02:40 simon Exp $
+
+COMMENT =	modification of UTF-7 encoding for IMAP
+
+DISTNAME =	Encode-IMAPUTF7-1.00
+CATEGORIES =	converters
+MODULES =	cpan
+
+MAINTAINER =	Simon Bertrang <simon@openbsd.org>
+
+# Perl
+PERMIT_PACKAGE_CDROM =		Yes
+PERMIT_PACKAGE_FTP =		Yes
+PERMIT_DISTFILES_CDROM =	Yes
+PERMIT_DISTFILES_FTP =		Yes
+
+.include <bsd.port.mk>
diff --git a/converters/p5-Encode-IMAPUTF7/distinfo b/converters/p5-Encode-IMAPUTF7/distinfo
new file mode 100644
index 00000000000..bece69636a6
--- /dev/null
+++ b/converters/p5-Encode-IMAPUTF7/distinfo
@@ -0,0 +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
diff --git a/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm b/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm
new file mode 100644
index 00000000000..98bb6ad7de2
--- /dev/null
+++ b/converters/p5-Encode-IMAPUTF7/patches/patch-lib_Encode_IMAPUTF7_pm
@@ -0,0 +1,17 @@
+$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-";
diff --git a/converters/p5-Encode-IMAPUTF7/pkg/DESCR b/converters/p5-Encode-IMAPUTF7/pkg/DESCR
new file mode 100644
index 00000000000..cf18a41bc2e
--- /dev/null
+++ b/converters/p5-Encode-IMAPUTF7/pkg/DESCR
@@ -0,0 +1,3 @@
+IMAP mailbox names are encoded in a modified UTF7 when names contains
+international characters outside of the printable ASCII range.  The
+modified UTF-7 encoding is defined in RFC2060 (section 5.1.3).
diff --git a/converters/p5-Encode-IMAPUTF7/pkg/PLIST b/converters/p5-Encode-IMAPUTF7/pkg/PLIST
new file mode 100644
index 00000000000..bf44a82dc73
--- /dev/null
+++ b/converters/p5-Encode-IMAPUTF7/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/25 23:02:40 simon Exp $
+${P5SITE}/Encode/
+${P5SITE}/Encode/IMAPUTF7.pm
+@man man/man3p/Encode::IMAPUTF7.3p