diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index e0cd0e7b650a..70c2698736ad 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -1,114 +1,114 @@
 # Created by: Andrey Chernov <ache@FreeBSD.org>
 
 PORTNAME=	screen
 PORTVERSION=	4.9.0
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		ftp://ftp.gnu.org/gnu/screen/ \
 		ftp://gnu.mirror.iweb.com/screen/ \
 		http://gnu.mirror.iweb.com/screen/ \
 		http://mirror.sdunix.com/gnu/ \
 		ftp://mirrors.kernel.org/gnu/screen/ \
 		http://cschubert.com/distfiles/ \
 		LOCAL/cy
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Multi-screen window manager
 
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
 OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
 			NCURSES_DEFAULT
 OPTIONS_SINGLE=		IPC NCURSES
 OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
 OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
 NETHACK_DESC=		Enable nethack-style messages
 XTERM_256_DESC=		Enable support for 256 colour xterm
 SHOWENC_DESC=		Show encoding on the status line
 SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
 NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
 SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
 NCURSES_DEFAULT_DESC=	Depend on ncurses (ports if installed, otherwise base)
 NCURSES_BASE_DESC=	Depend on ncurses in base
 NCURSES_PORT_DESC=	Depend on devel/ncurses in ports
 
 NCURSES_DEFAULT_USES=	autoreconf:build ncurses
 NCURSES_BASE_USES=	ncurses:base
 NCURSES_PORT_USES=	ncurses:port
 
 OPTIONS_SUB=
 
 USES=		gmake cpe
 MAKE_ARGS+=	WITH_MAN=1
 
 CPE_VENDOR=	gnu
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \
     ${ARCH:Mpowerpc*}
 SSP_CFLAGS?=	-fno-stack-protector
 .endif
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${NCURSESINC}
 LDFLAGS+=	-L${NCURSESLIB}
 
 .if ${PORT_OPTIONS:MINFO}
 INFO=		screen
 MAKE_ARGS+=	WITH_INFO=1
 USES+=		makeinfo
 .endif
 
 # Enables support for 256 colour xterm.  Note that you may need to
 # set up a custom termcap entry or .screenrc which modifies termcap
 # to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
 #
 .if ${PORT_OPTIONS:MXTERM_256}
 CFLAGS+=	-DCOLORS256
 .endif
 
 .if ! ${PORT_OPTIONS:MNETHACK}
 CFLAGS+=	-DNONETHACK
 .endif
 
 # show encoding on the status line via option "showenc"
 .if ${PORT_OPTIONS:MSHOWENC}
-EXTRA_PATCHES+=	${FILESDIR}/opt-showencoding
+CFLAGS+=	-DENCODINGS
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/screen.info*
 
 # Bug 191029:	Users can choose whether to use sockets or named pipes.
 #		Choose sockets if you don't know what the difference is.
 #		Choose named pipes if your environment is heterogeneous,
 #		using both screen 4.0.3 and 4.2.1.
 # Bug 191017
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 post-configure-NAMED_PIPES-on:
 	@${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h
 	@${ECHO_CMD} User selected named pipes override set.
 
 ETCDIR?=	${PREFIX}/etc
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
 		${STAGEDIR}${ETCDIR}/screenrc.sample
 .else
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
 		${STAGEDIR}${ETCDIR}/screenrc.sample
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/screen/files/opt-showencoding b/sysutils/screen/files/opt-showencoding
deleted file mode 100644
index b931f0d67292..000000000000
--- a/sysutils/screen/files/opt-showencoding
+++ /dev/null
@@ -1,21 +0,0 @@
---- screen.c.orig	2017-01-17 11:28:29.397404660 -0800
-+++ screen.c	2017-01-18 12:24:40.855402000 -0800
-@@ -2760,6 +2760,18 @@
-       }
-       p += strlen(p) - 1;
-       break;
-+#ifdef ENCODINGS
-+	case 'e':
-+	  *p = 0;
-+	  D_encoding = nwin_options.encoding > 0 ? nwin_options.encoding : 0;
-+	  if (win && win->w_encoding)
-+	    {
-+	      *p++ = ' ';
-+	      strcpy(p, EncodingName(win->w_encoding));
-+	    }
-+	  p += strlen(p) - 1;
-+	  break;
-+#endif
- 
-     case '{':
-     {