diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 840d0b4d297a..787fa7ab8742 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -20,8 +21,34 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6
 
+.if defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.3:${PORTSDIR}/security/gpgme
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+CONFIGURE_ARGS+=--enable-gpgme
+.endif
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--enable-ssl
+.endif
+
 PORTDOCS=	ChangeLog INSTALL README TODO
 
+pre-extract:
+.if defined(WITH_GPGME)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WARNING: GnuPG support using GPGME is still experimental."
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable GnuPG support using GPGME by defining WITH_GPGME."
+	@${ECHO_MSG} "WARNING: GnuPG support is still experimental."
+.endif
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can disable OpenSSL support by defining WITHOUT_SSL."
+.endif
+	@${ECHO_MSG}
+
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/sylpheed
diff --git a/mail/sylpheed/files/patch-ac b/mail/sylpheed/files/patch-ac
index 7fa827481777..86cde54e6a53 100644
--- a/mail/sylpheed/files/patch-ac
+++ b/mail/sylpheed/files/patch-ac
@@ -1,6 +1,6 @@
---- src/defs.h.orig	Thu Nov  9 01:28:14 2000
-+++ src/defs.h	Thu Nov  9 01:28:24 2000
-@@ -57,8 +57,8 @@
+--- src/defs.h.orig	Mon Sep  3 01:07:32 2001
++++ src/defs.h	Mon Sep  3 04:50:35 2001
+@@ -58,8 +58,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -10,4 +10,13 @@
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
+@@ -67,7 +67,7 @@
+ #ifdef _PATH_MAILDIR
+ #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
+ #else
+-#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
++#  define DEFAULT_SPOOL_PATH	"/var/mail"
+ #endif
  
+ #define BUFFSIZE			8192
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 840d0b4d297a..787fa7ab8742 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -20,8 +21,34 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6
 
+.if defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.3:${PORTSDIR}/security/gpgme
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+CONFIGURE_ARGS+=--enable-gpgme
+.endif
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--enable-ssl
+.endif
+
 PORTDOCS=	ChangeLog INSTALL README TODO
 
+pre-extract:
+.if defined(WITH_GPGME)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WARNING: GnuPG support using GPGME is still experimental."
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable GnuPG support using GPGME by defining WITH_GPGME."
+	@${ECHO_MSG} "WARNING: GnuPG support is still experimental."
+.endif
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can disable OpenSSL support by defining WITHOUT_SSL."
+.endif
+	@${ECHO_MSG}
+
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/sylpheed
diff --git a/mail/sylpheed2-devel/files/patch-ac b/mail/sylpheed2-devel/files/patch-ac
index 7fa827481777..86cde54e6a53 100644
--- a/mail/sylpheed2-devel/files/patch-ac
+++ b/mail/sylpheed2-devel/files/patch-ac
@@ -1,6 +1,6 @@
---- src/defs.h.orig	Thu Nov  9 01:28:14 2000
-+++ src/defs.h	Thu Nov  9 01:28:24 2000
-@@ -57,8 +57,8 @@
+--- src/defs.h.orig	Mon Sep  3 01:07:32 2001
++++ src/defs.h	Mon Sep  3 04:50:35 2001
+@@ -58,8 +58,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -10,4 +10,13 @@
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
+@@ -67,7 +67,7 @@
+ #ifdef _PATH_MAILDIR
+ #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
+ #else
+-#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
++#  define DEFAULT_SPOOL_PATH	"/var/mail"
+ #endif
  
+ #define BUFFSIZE			8192
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 840d0b4d297a..787fa7ab8742 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -20,8 +21,34 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6
 
+.if defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.3:${PORTSDIR}/security/gpgme
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+CONFIGURE_ARGS+=--enable-gpgme
+.endif
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--enable-ssl
+.endif
+
 PORTDOCS=	ChangeLog INSTALL README TODO
 
+pre-extract:
+.if defined(WITH_GPGME)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WARNING: GnuPG support using GPGME is still experimental."
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable GnuPG support using GPGME by defining WITH_GPGME."
+	@${ECHO_MSG} "WARNING: GnuPG support is still experimental."
+.endif
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can disable OpenSSL support by defining WITHOUT_SSL."
+.endif
+	@${ECHO_MSG}
+
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/sylpheed
diff --git a/mail/sylpheed2/files/patch-ac b/mail/sylpheed2/files/patch-ac
index 7fa827481777..86cde54e6a53 100644
--- a/mail/sylpheed2/files/patch-ac
+++ b/mail/sylpheed2/files/patch-ac
@@ -1,6 +1,6 @@
---- src/defs.h.orig	Thu Nov  9 01:28:14 2000
-+++ src/defs.h	Thu Nov  9 01:28:24 2000
-@@ -57,8 +57,8 @@
+--- src/defs.h.orig	Mon Sep  3 01:07:32 2001
++++ src/defs.h	Mon Sep  3 04:50:35 2001
+@@ -58,8 +58,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -10,4 +10,13 @@
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
+@@ -67,7 +67,7 @@
+ #ifdef _PATH_MAILDIR
+ #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
+ #else
+-#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
++#  define DEFAULT_SPOOL_PATH	"/var/mail"
+ #endif
  
+ #define BUFFSIZE			8192
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 840d0b4d297a..787fa7ab8742 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
@@ -20,8 +21,34 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6
 
+.if defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.3:${PORTSDIR}/security/gpgme
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+CONFIGURE_ARGS+=--enable-gpgme
+.endif
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--enable-ssl
+.endif
+
 PORTDOCS=	ChangeLog INSTALL README TODO
 
+pre-extract:
+.if defined(WITH_GPGME)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "WARNING: GnuPG support using GPGME is still experimental."
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable GnuPG support using GPGME by defining WITH_GPGME."
+	@${ECHO_MSG} "WARNING: GnuPG support is still experimental."
+.endif
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can disable OpenSSL support by defining WITHOUT_SSL."
+.endif
+	@${ECHO_MSG}
+
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/sylpheed
diff --git a/mail/sylpheed3/files/patch-ac b/mail/sylpheed3/files/patch-ac
index 7fa827481777..86cde54e6a53 100644
--- a/mail/sylpheed3/files/patch-ac
+++ b/mail/sylpheed3/files/patch-ac
@@ -1,6 +1,6 @@
---- src/defs.h.orig	Thu Nov  9 01:28:14 2000
-+++ src/defs.h	Thu Nov  9 01:28:24 2000
-@@ -57,8 +57,8 @@
+--- src/defs.h.orig	Mon Sep  3 01:07:32 2001
++++ src/defs.h	Mon Sep  3 04:50:35 2001
+@@ -58,8 +58,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -10,4 +10,13 @@
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
+@@ -67,7 +67,7 @@
+ #ifdef _PATH_MAILDIR
+ #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
+ #else
+-#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
++#  define DEFAULT_SPOOL_PATH	"/var/mail"
+ #endif
  
+ #define BUFFSIZE			8192