diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 936ff2837b23..c11c31a9e88d 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	3.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
+MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -95,16 +95,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \
 		${WRKSRC}/src/Makefile.in
 
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = /s/manual faq//' \
 		${WRKSRC}/Makefile.in
-.else
+
+post-patch-DOCS-on:
 .for i in ${MAKEFILES}
 	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
 		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
 		${WRKSRC}/${i}
 .endfor
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/sylpheed/files/patch-libsylph_ssl.c b/mail/sylpheed/files/patch-libsylph_ssl.c
new file mode 100644
index 000000000000..1a61a1b5e7b6
--- /dev/null
+++ b/mail/sylpheed/files/patch-libsylph_ssl.c
@@ -0,0 +1,16 @@
+--- libsylph/ssl.c.orig	2017-02-02 08:02:49 UTC
++++ libsylph/ssl.c
+@@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf
+ 		return FALSE;
+ 	}
+ 
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++	if (!SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname)) {
++		g_warning("Error setting servername extension\n");
++		return FALSE;
++	}
++#endif
++
+ 	SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+ 	while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
+ 		err = SSL_get_error(sockinfo->ssl, ret);