diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index ca0df511278..ec27ba7dd74 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1999/11/30 22:59:18 brad Exp $
+# $OpenBSD: Makefile,v 1.13 1999/12/09 21:17:19 brad Exp $
 
 DISTNAME=	screen-3.9.5
 CATEGORIES=	misc
@@ -6,13 +6,10 @@ MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= screen
 
-MAINTAINER=	uk1o@rz114s0-197.rz.uni-karlsruhe.de
+MAINTAINER=	brad@openbsd.org
 
 GNU_CONFIGURE=	yes
 
-pre-configure:
-	@rm -f ${WRKSRC}/doc/screen.info*
-
 post-install:
 	@mkdir -p ${PREFIX}/lib/screen
 	@install-info ${PREFIX}/info/screen.info ${PREFIX}/info/dir
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index 8a19c287403..d8e322fddd3 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,10 +1,13 @@
---- Makefile.in.orig	Tue Nov  9 21:23:15 1999
-+++ Makefile.in	Tue Nov  9 21:24:22 1999
-@@ -21,7 +21,6 @@
+--- Makefile.in.orig	Wed Sep  1 18:50:31 1999
++++ Makefile.in	Thu Dec  9 16:04:03 1999
+@@ -21,8 +21,8 @@
  ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
  
  CC = @CC@
 -CFLAGS = -O
- LDFLAGS =
+-LDFLAGS =
++CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  
+ CPP_DEPEND=$(CC) -MM
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
index 31d9489999e..baaae01f7fe 100644
--- a/misc/screen/patches/patch-ab
+++ b/misc/screen/patches/patch-ab
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Tue Nov  9 21:25:24 1999
-+++ doc/Makefile.in	Tue Nov  9 21:26:28 1999
+--- doc/Makefile.in.orig	Wed Sep  1 18:50:32 1999
++++ doc/Makefile.in	Thu Dec  9 16:05:41 1999
 @@ -9,7 +9,7 @@
  
  INSTALL = @INSTALL@
@@ -9,7 +9,15 @@
  TEXI2DVI = texi2dvi
  
  SHELL = /bin/sh
-@@ -28,9 +28,6 @@
+@@ -20,6 +20,7 @@
+ 	$(TEXI2DVI) $(srcdir)/screen.texinfo
+ 
+ info screen.info: screen.texinfo
++	@rm -f screen.info*
+ 	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
+ 
+ install: installdirs
+@@ -28,9 +29,6 @@
  	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
  	if test -f $$d/screen.info; then \
  	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \