diff --git a/x11/nx/nxssh/Makefile b/x11/nx/nxssh/Makefile
index 4670517453c..c2b3e537071 100644
--- a/x11/nx/nxssh/Makefile
+++ b/x11/nx/nxssh/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2012/01/03 16:37:49 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2012/01/03 17:42:19 ajacoutot Exp $
 
 COMMENT=	OpenSSH client and daemon for NX
 
 DASH_VER=	2
 DISTNAME=	nxssh-${MAJOR_VERSION}-${DASH_VER}
 PKGNAME=	nxssh-${MAJOR_VERSION}.${DASH_VER}
+REVISION=	0
 
 CATEGORIES=	net
 
@@ -22,12 +23,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/nx -I/usr/include/kerberosV/" \
 
 WRKDIST=	${WRKDIR}/nxssh
 
+MAKE_FLAGS=	ASKPASS_PROGRAM=${X11BASE}/bin/ssh-askpass \
+		SFTP_SERVER=/usr/libexec/sftp-server \
+		SSH_KEYSIGN=/usr/libexec/ssh-keysign
+
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/NX/bin
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/NX/sbin
-.for i in nxssh nxssh-keygen
-	${INSTALL_PROGRAM} ${WRKBUILD}/${i} ${PREFIX}/NX/bin
-.endfor
-	${INSTALL_PROGRAM} ${WRKBUILD}/nxsshd ${PREFIX}/NX/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/nxssh ${PREFIX}/NX/bin
 
 .include <bsd.port.mk>
diff --git a/x11/nx/nxssh/pkg/PLIST b/x11/nx/nxssh/pkg/PLIST
index f57498396a3..07b29246a0c 100644
--- a/x11/nx/nxssh/pkg/PLIST
+++ b/x11/nx/nxssh/pkg/PLIST
@@ -1,7 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/03/02 06:56:38 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/01/03 17:42:19 ajacoutot Exp $
 NX/
 NX/bin/
 @bin NX/bin/nxssh
-@bin NX/bin/nxssh-keygen
-NX/sbin/
-@bin NX/sbin/nxsshd