diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index d4c98fe8ae6..d9cb2785f05 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.72 2019/09/05 17:35:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2020/02/06 16:17:20 sthen Exp $
 
 COMMENT=	multi-screen window manager
 
-DISTNAME=	screen-4.6.2
+DISTNAME=	screen-4.8.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
@@ -11,8 +11,7 @@ HOMEPAGE=	https://www.gnu.org/software/screen/
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
-AUTOCONF_VERSION=2.69
-CONFIGURE_STYLE= autoconf no-autoheader
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-sys-screenrc="${SYSCONFDIR}/screenrc"
 USE_GMAKE=	Yes
 USE_GROFF=	Yes
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 8dc979fef2b..eca396ee79a 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (screen-4.6.2.tar.gz) = G2kiUg5qDOXih2jWILD2QKZjE5f5XMsEO3C5G7UD+jo=
-SIZE (screen-4.6.2.tar.gz) = 845210
+SHA256 (screen-4.8.0.tar.gz) = bhGxPYSJkl/eJd+wk1v27XH560fv8jOhgeB4/eVlWqE=
+SIZE (screen-4.8.0.tar.gz) = 854854
diff --git a/misc/screen/patches/patch-configure_ac b/misc/screen/patches/patch-configure_ac
deleted file mode 100644
index 3feeb2a9930..00000000000
--- a/misc/screen/patches/patch-configure_ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2019/09/05 17:35:06 sthen Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -374,7 +374,7 @@ main()
- }
- ], AC_NOTE(- your fifos are usable) fifo=1,
- AC_NOTE(- your fifos are not usable))
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- 
- if test -n "$fifo"; then
- AC_CHECKING(for broken fifo implementation)
-@@ -422,7 +422,7 @@ main()
- }
- ], AC_NOTE(- your implementation is ok), 
- AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- fi
- 
- dnl
-@@ -484,7 +484,7 @@ main()
- }
- ], AC_NOTE(- your sockets are usable) sock=1,
- AC_NOTE(- your sockets are not usable))
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- 
- if test -n "$sock"; then
- AC_CHECKING(socket implementation)
-@@ -523,7 +523,7 @@ main()
- ],AC_NOTE(- you are normal),
- AC_NOTE(- unix domain sockets are not kept in the filesystem)
- AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- fi
- 
- 
-@@ -624,6 +624,7 @@ main()
- }
- ],AC_NOTE(- select is ok),
- AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
-+rm -f /tmp/conftest$$
- 
- dnl
- dnl    ****  termcap or terminfo  ****
diff --git a/misc/screen/patches/patch-doc_screen_1 b/misc/screen/patches/patch-doc_screen_1
index 84eddeffec6..541601a18fe 100644
--- a/misc/screen/patches/patch-doc_screen_1
+++ b/misc/screen/patches/patch-doc_screen_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-doc_screen_1,v 1.6 2019/09/05 17:35:06 sthen Exp $
+$OpenBSD: patch-doc_screen_1,v 1.7 2020/02/06 16:17:20 sthen Exp $
 
 Index: doc/screen.1
 --- doc/screen.1.orig
@@ -21,7 +21,7 @@ Index: doc/screen.1
  This can also be defined through the \*Qdeflogin\*U .screenrc command.
  .TP 5
  .BR \-ls " [" \fImatch ]
-@@ -725,7 +725,7 @@ in the environment variable $SCREENDIR.
+@@ -782,7 +782,7 @@ in the environment variable $SCREENDIR.
  When
  .I screen
  is invoked, it executes initialization commands from the files
@@ -30,7 +30,7 @@ Index: doc/screen.1
  \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
  defaults\*U that can be overridden in the following ways: for the
  global screenrc file 
-@@ -1953,7 +1953,7 @@ when seeing proper escape sequence. See also "TITLES (
+@@ -2050,7 +2050,7 @@ when seeing proper escape sequence. See also "TITLES (
  The echo command may be used to annoy 
  .I screen
  users with a 'message of the
@@ -39,7 +39,7 @@ Index: doc/screen.1
  The option \*Q\-n\*U may be used to suppress the line feed.
  See also \*Qsleep\*U.
  Echo is also useful for online checking of environment variables.
-@@ -5087,12 +5087,12 @@ Examples in the 
+@@ -5196,12 +5196,12 @@ Examples in the 
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
@@ -54,7 +54,7 @@ Index: doc/screen.1
  .IP $SCREENDIR/S\-<login>
  .IP /local/screens/S\-<login>
  Socket directories (default)
-@@ -5113,7 +5113,7 @@ Output log files created by the log function
+@@ -5222,7 +5222,7 @@ Output log files created by the log function
  or
  .IP /etc/termcap
  Terminal capability databases
@@ -63,7 +63,7 @@ Index: doc/screen.1
  Login records
  .IP $LOCKPRG
  Program that locks a terminal.
-@@ -5235,9 +5235,9 @@ does not make use of hardware tabs.
+@@ -5349,9 +5349,9 @@ does not make use of hardware tabs.
  must be installed as set-uid with owner root on most systems in order
  to be able to correctly change the owner of the tty device file for
  each window.
diff --git a/misc/screen/patches/patch-tty_sh b/misc/screen/patches/patch-tty_sh
deleted file mode 100644
index d19f799cb67..00000000000
--- a/misc/screen/patches/patch-tty_sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tty_sh,v 1.1 2019/09/05 17:35:06 sthen Exp $
-
-Index: tty.sh
---- tty.sh.orig
-+++ tty.sh
-@@ -813,7 +813,7 @@ int fd;
-   /*
-    * Under BSD we have to set the controlling terminal again explicitly.
-    */
--# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__)) && defined(TIOCSCTTY)
-+# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__) || defined(__OpenBSD__)) && defined(TIOCSCTTY)
-   ioctl(fd, TIOCSCTTY, (char *)0);
- # endif
-