diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index a29ca0a2ca85..e28247f1b6ee 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -6,7 +6,8 @@ PORTVERSION=	4.0.0
 # confirmed via testing that it is necessary
 PORTREVISION=	2
 CATEGORIES=	security net-im net
-MASTER_SITES=	http://www.cypherpunks.ca/otr/
+MASTER_SITES=	https://otr.cypherpunks.ca/ \
+		http://www.c-s.li/ports/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -17,24 +18,14 @@ BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-
 CONFLICTS=	libotr-3.*
 
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
 
-MAN1=		otr_toolkit.1
-MLINKS=		otr_toolkit.1 otr_parse.1 \
-		otr_toolkit.1 otr_sesskeys.1 \
-		otr_toolkit.1 otr_mackey.1 \
-		otr_toolkit.1 otr_readforge.1 \
-		otr_toolkit.1 otr_modify.1 \
-		otr_toolkit.1 otr_remac.1
-
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/security/libotr/pkg-descr b/security/libotr/pkg-descr
index 695d5c127782..6aca00c402a7 100644
--- a/security/libotr/pkg-descr
+++ b/security/libotr/pkg-descr
@@ -1,4 +1,4 @@
 This is the library and toolkit for Off-the-Record Messaging used by
 the pidgin-otr plugin.
 
-WWW: http://www.cypherpunks.ca/otr/
+WWW: https://otr.cypherpunks.ca/
diff --git a/security/libotr/pkg-plist b/security/libotr/pkg-plist
index 2f3a3f01de67..a255f7d36a5a 100644
--- a/security/libotr/pkg-plist
+++ b/security/libotr/pkg-plist
@@ -25,5 +25,12 @@ lib/libotr.la
 lib/libotr.so
 lib/libotr.so.5
 libdata/pkgconfig/libotr.pc
+man/man1/otr_mackey.1.gz
+man/man1/otr_modify.1.gz
+man/man1/otr_parse.1.gz
+man/man1/otr_readforge.1.gz
+man/man1/otr_remac.1.gz
+man/man1/otr_sesskeys.1.gz
+man/man1/otr_toolkit.1.gz
 share/aclocal/libotr.m4
 @dirrm include/libotr