diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 75dbba18e98d..4753d80671f5 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	OpenSSH-askpass
 PORTVERSION=	1.2.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.jmknoble.net/software/x11-ssh-askpass/
 DISTNAME=	x11-ssh-askpass-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Graphical password applet for entering SSH passphrase
 WWW=		http://www.jmknoble.net/software/x11-ssh-askpass/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README
 
 USES=		uidfix xorg
 USE_XORG=	x11 xt sm ice
 DOCSDIR=	${PREFIX}/share/doc/ssh-askpass
 PLIST_FILES=	bin/x11-ssh-askpass \
 		bin/ssh-askpass \
 		lib/X11/app-defaults/SshAskpass \
-		man/man1/ssh-askpass.1.gz \
-		man/man1/x11-ssh-askpass.1.gz
+		share/man/man1/ssh-askpass.1.gz \
+		share/man/man1/x11-ssh-askpass.1.gz
 PORTDOCS=	README TODO ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/openssh-askpass/files/Makefile.in b/security/openssh-askpass/files/Makefile.in
index 1921e83a6de6..6874311b24a9 100644
--- a/security/openssh-askpass/files/Makefile.in
+++ b/security/openssh-askpass/files/Makefile.in
@@ -1,47 +1,47 @@
 PREFIX?=	/usr/local
 LOCALBASE?=	/usr/local
 BINDIR?=	${PREFIX}/bin
-MANDIR?=	${PREFIX}/man/man
+MANDIR?=	${PREFIX}/share/man/man
 
 CLASS=		SshAskpass
 FILES=		${CLASS}
 FILESDIR?=	${PREFIX}/lib/X11/app-defaults
 
 PROG=	x11-ssh-askpass
 
 SRCS=	drawing.c dynlist.c resources.c x11-ssh-askpass.c
 LDADD=	-lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 CFLAGS+=-I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO
 MAN=	${PROG}.1
 
 x11-ssh-askpass.o: ${CLASS}_ad.h
 
 ${PROG}.1: x11-ssh-askpass.man.in
 	sed -e 's|@NAME@|${PROG}|' \
 		-e 's|@DATE@|September 17, 2001|'\
 		-e 's|@VERSION@|1.2.4.1|'\
 		< $? > $@
 
 ${CLASS}: ${CLASS}.ad
 	cp $? $@
 
 ${CLASS}.ad: ${CLASS}-default.ad
 	cp $? $@
 
 ${CLASS}_ad.h:	${CLASS}.ad
 	sed -n '/^[^!]/s/.*/"&",/p' < $? > $@ || (rm -f $@; false)
 
 ${PROG}: ${CLASS}_ad.h
 CLEANFILES+=	${CLASS}_ad.h
 
 ssh-askpass: ${PROG}
 	ln -s -f $? $@
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}
 
 afterinstall:
 	ln -s -f ${PROG} ${DESTDIR}${BINDIR}/ssh-askpass
 	ln -s -f ${PROG}.1 ${DESTDIR}${MANDIR}1/ssh-askpass.1
 
 .include <bsd.prog.mk>