diff --git a/security/ssh-multiadd/Makefile b/security/ssh-multiadd/Makefile
index 831ae3fcc5aa..9bbdfc484178 100644
--- a/security/ssh-multiadd/Makefile
+++ b/security/ssh-multiadd/Makefile
@@ -1,32 +1,26 @@
-# New ports collection makefile for:	ssh-multiadd
-# Date created:				29 April 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
+# Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ssh-multiadd
 PORTVERSION=	1.3.2
 CATEGORIES=	security
-MASTER_SITES=	http://users.dakotacom.net/~donut/programs/ssh-multiadd/
+MASTER_SITES=	SUNSITE/system/network/telnet
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to add multiple ssh keys to the authentication agent
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-10-20
-
-USE_PYTHON=	yes
+USE_PYTHON_RUN=	yes
 NO_BUILD=	yes
 MAN1=		ssh-multiadd.1
 PLIST_FILES=	bin/ssh-multiadd
 
 post-patch:
-	@${REINPLACE_CMD} -e 's!/usr/bin/python2!${PYTHON_CMD}!' \
-			-e 's!#break!break!' ${WRKSRC}/ssh-multiadd
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin/python2|${PYTHON_CMD}| ; \
+		s|#break|break|' ${WRKSRC}/ssh-multiadd
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ssh-multiadd ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ssh-multiadd.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ssh-multiadd.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/ssh-multiadd/pkg-descr b/security/ssh-multiadd/pkg-descr
index 5b68cdb30ce0..b87a83a6da49 100644
--- a/security/ssh-multiadd/pkg-descr
+++ b/security/ssh-multiadd/pkg-descr
@@ -6,5 +6,3 @@ file. It uses ssh-askpass if necessary. Unlike ssh-add, if any of
 the keys use the same passphrase, you will only need to enter each
 unique passphrase once, and keys that are already added will not
 be prompted for again.
-
-WWW: http://users.dakotacom.net/~donut/programs/index_s.html#ssh-multiadd