diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 7b6e5d91a7b5..f01fae0b4e01 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,7 +19,8 @@ MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
 LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
+		${LOCALBASE}/bin/metamail:${PORTSDIR}/mail/metamail
 
 THEMEVERSION=	20040929
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
@@ -60,10 +61,6 @@ OPTIONS=	ALL		"Enable all options."			off \
 		THEMES		"Install additional themes."		on
 		
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=		${FILESDIR}/extra-doc:Makefile.in
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SSL)
diff --git a/mail/claws-mail/files/extra-doc:Makefile.in b/mail/claws-mail/files/extra-doc:Makefile.in
deleted file mode 100644
index 7cb0b03d88ed..000000000000
--- a/mail/claws-mail/files/extra-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon May 10 10:06:47 2004
-+++ doc/Makefile.in	Mon May 10 10:07:06 2004
-@@ -257,7 +257,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = faq man manual
-+SUBDIRS = man
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 7b6e5d91a7b5..f01fae0b4e01 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,7 +19,8 @@ MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
 LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
+		${LOCALBASE}/bin/metamail:${PORTSDIR}/mail/metamail
 
 THEMEVERSION=	20040929
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
@@ -60,10 +61,6 @@ OPTIONS=	ALL		"Enable all options."			off \
 		THEMES		"Install additional themes."		on
 		
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=		${FILESDIR}/extra-doc:Makefile.in
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SSL)
diff --git a/mail/sylpheed-claws/files/extra-doc:Makefile.in b/mail/sylpheed-claws/files/extra-doc:Makefile.in
deleted file mode 100644
index 7cb0b03d88ed..000000000000
--- a/mail/sylpheed-claws/files/extra-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon May 10 10:06:47 2004
-+++ doc/Makefile.in	Mon May 10 10:07:06 2004
-@@ -257,7 +257,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = faq man manual
-+SUBDIRS = man
- all: all-recursive
- 
- .SUFFIXES: