diff --git a/mail/pear-Mail-Mime/Makefile b/mail/pear-Mail-Mime/Makefile
index 9542128aa59..08af200279f 100644
--- a/mail/pear-Mail-Mime/Makefile
+++ b/mail/pear-Mail-Mime/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2010/03/21 00:02:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/04/19 14:24:32 giovanni Exp $
 
 COMMENT=	classes to create and decode MIME messages in PHP
 
-DISTNAME=	Mail_Mime-1.5.3
+DISTNAME=	Mail_Mime-1.8.1
 PKGNAME=	pear-${DISTNAME:S/_/-/}
 CATEGORIES=	mail
 
diff --git a/mail/pear-Mail-Mime/distinfo b/mail/pear-Mail-Mime/distinfo
index 57ae33994ef..76bf4a41e15 100644
--- a/mail/pear-Mail-Mime/distinfo
+++ b/mail/pear-Mail-Mime/distinfo
@@ -1,5 +1,5 @@
-MD5 (Mail_Mime-1.5.3.tgz) = vCugYO/KTyPiZR1oL6mF7w==
-RMD160 (Mail_Mime-1.5.3.tgz) = LDPPa6ULDQBUu77cMUEwhAdyuiw=
-SHA1 (Mail_Mime-1.5.3.tgz) = C9E/BHd4JvmEmf/cTWCZKtHjFmc=
-SHA256 (Mail_Mime-1.5.3.tgz) = KQVVvX3/NLqElKVtHFRDEOjCwpkIHu+57ZJktStSivQ=
-SIZE (Mail_Mime-1.5.3.tgz) = 25309
+MD5 (Mail_Mime-1.8.1.tgz) = zTOV3UtgJ4KuZcfbGkjKFg==
+RMD160 (Mail_Mime-1.8.1.tgz) = fOCkoGUV5ZhQ7A9nh7DLH8eO8rc=
+SHA1 (Mail_Mime-1.8.1.tgz) = ZfyuehzOl8XvWVlDo8/PpwhALF8=
+SHA256 (Mail_Mime-1.8.1.tgz) = swU9EzK1hj5F/WIkAElYImgVQEA9f719Ify5Pf99f9c=
+SIZE (Mail_Mime-1.8.1.tgz) = 31530
diff --git a/mail/pear-Mail-Mime/pkg/PLIST b/mail/pear-Mail-Mime/pkg/PLIST
index c13b85db4bb..933d814cc67 100644
--- a/mail/pear-Mail-Mime/pkg/PLIST
+++ b/mail/pear-Mail-Mime/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2010/03/21 00:02:22 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/04/19 14:24:32 giovanni Exp $
 @group daemon
 lib/
 lib/php/
@@ -17,19 +17,23 @@ pear/tests/Mail_Mime/
 pear/tests/Mail_Mime/tests/
 pear/tests/Mail_Mime/tests/class-filename.phpt
 pear/tests/Mail_Mime/tests/encoding_case.phpt
-pear/tests/Mail_Mime/tests/headers_encoding.phpt
+pear/tests/Mail_Mime/tests/headers_with_mbstring.phpt
+pear/tests/Mail_Mime/tests/headers_without_mbstring.phpt
 pear/tests/Mail_Mime/tests/sleep_wakeup_EOL-bug3488-part1.phpt
 pear/tests/Mail_Mime/tests/sleep_wakeup_EOL-bug3488-part2.phpt
 pear/tests/Mail_Mime/tests/test_Bug_10596_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_10816_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_11731.phpt
+pear/tests/Mail_Mime/tests/test_Bug_12411.phpt
+pear/tests/Mail_Mime/tests/test_Bug_13444.phpt
+pear/tests/Mail_Mime/tests/test_Bug_13962.phpt
 pear/tests/Mail_Mime/tests/test_Bug_14529.phpt
 pear/tests/Mail_Mime/tests/test_Bug_14779.phpt
+pear/tests/Mail_Mime/tests/test_Bug_14780.phpt
 pear/tests/Mail_Mime/tests/test_Bug_15320.phpt
-pear/tests/Mail_Mime/tests/test_Bug_30_1.phpt
-pear/tests/Mail_Mime/tests/test_Bug_30_2.phpt
-pear/tests/Mail_Mime/tests/test_Bug_30_3.phpt
-pear/tests/Mail_Mime/tests/test_Bug_30_4.phpt
+pear/tests/Mail_Mime/tests/test_Bug_17025.phpt
+pear/tests/Mail_Mime/tests/test_Bug_17175.phpt
+pear/tests/Mail_Mime/tests/test_Bug_18083.phpt
 pear/tests/Mail_Mime/tests/test_Bug_3513_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_3513_2.phpt
 pear/tests/Mail_Mime/tests/test_Bug_3513_3.phpt
@@ -38,5 +42,3 @@ pear/tests/Mail_Mime/tests/test_Bug_8386_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_8541_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_9558_1.phpt
 pear/tests/Mail_Mime/tests/test_Bug_9722_1.phpt
-pear/tests/Mail_Mime/tests/test_Bug_9725_1.phpt
-pear/tests/Mail_Mime/tests/test_Bug_9976_1.phpt