diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index b38a043c4fb..35d6d66e912 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/06/11 17:12:37 landry Exp $
+# $OpenBSD: Makefile,v 1.8 2010/06/14 19:52:23 kili Exp $
 
 COMMENT=	mail purpose library
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=	converters/libiconv
 
-WANTLIB=	crypto expat ssl z intl
+WANTLIB=	crypto expat intl m ssl stdc++ z
 
 LIB_DEPENDS+=	curl::net/curl \
 		idn::devel/libidn \
diff --git a/mail/libetpan/patches/patch-configure b/mail/libetpan/patches/patch-configure
deleted file mode 100644
index c0610fd5aa5..00000000000
--- a/mail/libetpan/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2008/04/23 21:01:04 landry Exp $
---- configure.orig	Mon Apr 21 17:14:21 2008
-+++ configure	Mon Apr 21 18:16:31 2008
-@@ -2585,7 +2585,7 @@ API_VERSION="$API_CURRENT:$API_REVISION:$API_AGE"
- 
- BUILD_REVISION=0
- 
--BUILD_TIMESTAMP=`date --iso-8601=minutes`
-+BUILD_TIMESTAMP=`date "+%Y-%m-%dT%H:%M%z"`
- 
- BUILD_FILEVERSION=`echo "${VERSION_MAJOR}.${VERSION_MINOR}.0" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
- BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}"
diff --git a/mail/libetpan/patches/patch-src_low-level_mime_mailmime_disposition_c b/mail/libetpan/patches/patch-src_low-level_mime_mailmime_disposition_c
deleted file mode 100644
index 27b97e02bd1..00000000000
--- a/mail/libetpan/patches/patch-src_low-level_mime_mailmime_disposition_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_low-level_mime_mailmime_disposition_c,v 1.1 2009/01/22 20:07:20 jasper Exp $
---- src/low-level/mime/mailmime_disposition.c.orig	Thu Jan 22 20:52:23 2009
-+++ src/low-level/mime/mailmime_disposition.c	Thu Jan 22 20:52:33 2009
-@@ -42,6 +42,7 @@
- 
- #include <ctype.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- static int
- mailmime_disposition_parm_parse(const char * message, size_t length,