diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 2fd4384a6ad..fc133fe0628 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.74 2020/08/04 17:50:11 naddy Exp $
+# $OpenBSD: Makefile,v 1.75 2021/02/09 20:17:22 sthen Exp $
 
 COMMENT=	multi-screen window manager
 
 DISTNAME=	screen-4.8.0
+REVISION=	0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
@@ -14,6 +15,7 @@ PERMIT_PACKAGE=	Yes
 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
 CONFIGURE_ARGS=	--with-sys-screenrc="${SYSCONFDIR}/screenrc"
+
 USE_GMAKE=	Yes
 USE_GROFF=	Yes
 
@@ -28,6 +30,7 @@ WANTLIB=	c curses util
 
 ALL_TARGET=	screen screen.info
 #MAKE_FLAGS=	OPTIONS=-DDEBUG
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 pre-build:
 	@${SUBST_CMD} ${WRKSRC}/doc/screen.1
diff --git a/misc/screen/patches/patch-acconfig_h b/misc/screen/patches/patch-acconfig_h
new file mode 100644
index 00000000000..5a40df4197d
--- /dev/null
+++ b/misc/screen/patches/patch-acconfig_h
@@ -0,0 +1,16 @@
+$OpenBSD: patch-acconfig_h,v 1.1 2021/02/09 20:17:22 sthen Exp $
+
+https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
+
+Index: acconfig.h
+--- acconfig.h.orig
++++ acconfig.h
+@@ -157,7 +157,7 @@
+ # define FONT
+ # define DW_CHARS
+ # define ENCODINGS
+-# define UTF8
++// # define UTF8
+ # define COLORS16
+ # define ZMODEM
+ # define BLANKER_PRG