Index: security/stunnel/Makefile
===================================================================
--- security/stunnel/Makefile	(revision 322427)
+++ security/stunnel/Makefile	(working copy)
@@ -4,13 +4,15 @@
 PORTNAME=	stunnel
 PORTVERSION=	4.56
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.stunnel.org/stunnel/%SUBDIR%/ \
-		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
-		ftp://stunnel.mirt.net/stunnel/%SUBDIR%/ \
+MASTER_SITES=	https://www.stunnel.org/downloads/%SUBDIR%/ \
+		http://mirrors.go-part.com/stunnel/%SUBDIR%/ \
+		ftp://mirrors.go-part.com/stunnel/%SUBDIR%/ \
+		http://www.usenix.org.uk/mirrors/stunnel/%SUBDIR%/ \
+		http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
 		ftp://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
-		http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \
-		ftp://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \
-		http://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \
+		http://www.namesdir.com/mirrors/stunnel/%SUBDIR%/ \
+		http://stunnel.cybermirror.org/%SUBDIR%/ \
+		ftp://ftp.stunnel.org/stunnel/%SUBDIR%/ \
 		http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
 		http://mirrors.rit.edu/zi/
 MASTER_SITE_SUBDIR=	. obsolete/4.x
@@ -21,6 +23,7 @@
 # FIXME: IMHO, there really ought to be a GPL-2+ option or some such.
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_AUTOTOOLS=	libtool
 USE_RC_SUBR=	stunnel
@@ -48,9 +51,7 @@
 USERS=		${STUNNEL_USER}
 GROUPS=		${STUNNEL_GROUP}
 
-.if ${PORT_OPTIONS:MDOCS}
 MAN8=		stunnel.8 stunnel.fr.8 stunnel.pl.8
-.endif
 
 .if ${PORT_OPTIONS:MSSL_PORT}
 USE_OPENSSL=		YES
@@ -99,8 +100,8 @@
 	@${REINPLACE_CMD} -E -e 's|install-confDATA install-data-local|install-confDATA|g' \
 		${WRKSRC}/tools/Makefile.in
 .if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -E -e 's/ install-docDATA/ /; s/^(SUBDIRS.+)doc/\1/' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -E -e 's/ install-docDATA/ /' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -E -e '/install-data-am/s,install-docDATA,,' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -E -e 's/([^n])install-examplesDATA/\1/' \
 		${WRKSRC}/tools/Makefile.in
 .endif
Index: security/stunnel/pkg-descr
===================================================================
--- security/stunnel/pkg-descr	(revision 322427)
+++ security/stunnel/pkg-descr	(working copy)
@@ -8,4 +8,4 @@
 used  inetd  daemons  like  POP-2,  POP-3  and  IMAP servers
 without any changes in the programs' code.
 
-WWW: http://stunnel.org/
+WWW: https://www.stunnel.org/