diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index e6b55269baf..2aa811b753a 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2000/06/23 18:59:39 brad Exp $
+# $OpenBSD: Makefile,v 1.23 2000/07/04 19:33:08 brad Exp $
 
 DISTNAME=	screen-3.9.5
 PKGNAME=	screen-3.9.5p1
@@ -18,8 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 CONFIGURE_STYLE= gnu dest
 
 post-install:
-	@rm -f ${PREFIX}/bin/screen
-	@cd ${PREFIX}/bin; ln -sf screen-3.9.5 screen
+	@cd ${PREFIX}/bin && ln -sf screen-3.9.5 screen
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/lib/screen/screenrc
 	${INSTALL_DATA} ${WRKSRC}/terminfo/screencap ${PREFIX}/lib/screen
diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile
index f1ea007e041..370d011b0e7 100644
--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2000/07/04 02:23:35 brad Exp $
+# $OpenBSD: Makefile,v 1.23 2000/07/04 19:33:07 brad Exp $
 # $FreeBSD: Makefile,v 1.3 1998/07/21 11:38:44 eivind Exp $
 
 DISTNAME=	BitchX-1.0c16
@@ -45,8 +45,7 @@ FAKE_FLAGS=	INSTALL="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}"
 WRKDIST=	${WRKDIR}/BitchX
 
 post-install:
-	@rm -f ${PREFIX}/bin/BitchX
-	@cd ${PREFIX}/bin; ln -sf BitchX-1.0c16 BitchX
+	@cd ${PREFIX}/bin && ln -sf BitchX-1.0c16 BitchX
 	@find ${PREFIX}/share/bitchx/help -name 'CVS' -print | xargs rm -rf
 	@chown -R root.wheel ${PREFIX}/share/bitchx