diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 5a5aaab34f0a..3b90fb190ded 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -14,28 +14,23 @@ COMMENT=	Graphical password applet for entering SSH passphrase
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README
 
+USES=		uidfix
 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
+		lib/X11/app-defaults/SshAskpass \
+		man/man1/ssh-askpass.1.gz \
+		man/man1/x11-ssh-askpass.1.gz
 PORTDOCS=	README TODO ChangeLog
 
-MAN1=		x11-ssh-askpass.1
-MLINKS=		x11-ssh-askpass.1 ssh-askpass.1
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${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 988b1af39511..ffe5b585947b 100644
--- a/security/openssh-askpass/files/Makefile.in
+++ b/security/openssh-askpass/files/Makefile.in
@@ -41,10 +41,10 @@ ssh-askpass: ${PROG}
 	ln -s -f $? $@
 
 beforeinstall:
-	mkdir -p ${FILESDIR}
+	mkdir -p ${DESTDIR}${FILESDIR}
 
 afterinstall:
-	ln -s -f ${PROG} ${BINDIR}/ssh-askpass
-	ln -s -f ${PROG}.1 ${MANDIR}1/ssh-askpass.1
+	ln -s -f ${PROG} ${DESTDIR}${BINDIR}/ssh-askpass
+	ln -s -f ${PROG}.1 ${DESTDIR}${MANDIR}1/ssh-askpass.1
 
 .include <bsd.prog.mk>