diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 1de7d517972..5f4812cc679 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2004/01/17 05:34:28 brad Exp $
+# $OpenBSD: Makefile,v 1.53 2004/06/24 04:07:53 brad Exp $
 
 COMMENT=	"multi-screen window manager"
 
@@ -47,6 +47,6 @@ post-install:
 	@chmod 755 ${PREFIX}/bin/screen
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
-		${PREFIX}/share/examples/screen/screenrc-sample
+		${PREFIX}/share/examples/screen/screenrc
 
 .include <bsd.port.mk>
diff --git a/misc/screen/pkg/DEINSTALL b/misc/screen/pkg/DEINSTALL
index 51ec0d45846..9851e010082 100644
--- a/misc/screen/pkg/DEINSTALL
+++ b/misc/screen/pkg/DEINSTALL
@@ -1,9 +1,8 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.5 2003/09/29 11:08:02 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.6 2004/06/24 04:07:54 brad Exp $
 #
 # screen de-installation
 
-set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/screenrc
diff --git a/misc/screen/pkg/INSTALL b/misc/screen/pkg/INSTALL
index 2dbc18ec170..3e67d6a1e2d 100644
--- a/misc/screen/pkg/INSTALL
+++ b/misc/screen/pkg/INSTALL
@@ -1,15 +1,12 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.8 2001/09/06 04:02:24 brad Exp $
+# $OpenBSD: INSTALL,v 1.9 2004/06/24 04:07:54 brad Exp $
 #
 # Pre/post-installation setup of screen
 
-# exit on errors, use a sane path and install prefix
-#
-set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/screenrc
-SAMPLE_CONFIG_FILE=$PREFIX/share/examples/screen/screenrc-sample
+SAMPLE_CONFIG_FILE=$PREFIX/share/examples/screen/screenrc
 
 do_notice()
 {
@@ -35,15 +32,11 @@ do_install()
     echo
 }
 
-# verify proper execution
-#
 if [ $# -ne 2 ]; then
     echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
     exit 1
 fi
 
-# Verify/process the command
-#
 case $2 in
     PRE-INSTALL)
 	: nothing to pre-install for this port
diff --git a/misc/screen/pkg/PLIST b/misc/screen/pkg/PLIST
index ddbbe3888f4..5c079d7bdca 100644
--- a/misc/screen/pkg/PLIST
+++ b/misc/screen/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.20 2003/10/10 01:27:38 brad Exp $
+@comment $OpenBSD: PLIST,v 1.21 2004/06/24 04:07:54 brad Exp $
 bin/screen
 @unexec install-info --delete --info-dir=%D/info %D/info/screen.info
 info/screen.info
 @exec install-info --info-dir=%D/info %D/info/screen.info
 man/man1/screen.1
-share/examples/screen/screenrc-sample
+share/examples/screen/screenrc
 share/screen/utf8encodings/01
 share/screen/utf8encodings/02
 share/screen/utf8encodings/03