Index: head/x11/xkb-switch/Makefile
===================================================================
--- head/x11/xkb-switch/Makefile	(revision 566157)
+++ head/x11/xkb-switch/Makefile	(revision 566158)
@@ -1,39 +1,35 @@
 # Created by: Dmitri Goutnik <dg@syrec.org>
 # $FreeBSD$
 
 PORTNAME=	xkb-switch
-PORTVERSION=	1.6.0
+PORTVERSION=	1.8.5
 CATEGORIES=	x11
 
-# https://github.com/ierton/xkb-switch/pull/41
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch:-p1
-
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Switch your X keyboard layouts from the command line
 
 LICENSE=	GPLv3
 
 USES=		cmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ierton
 USE_XORG=	x11 xkbfile
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DMAN_COMPRESSION="gz" -DMANDIR="${MANPREFIX}/man"
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/xkb-switch \
 		lib/libxkbswitch.so \
 		lib/libxkbswitch.so.1 \
-		lib/libxkbswitch.so.1.6.0 \
+		lib/libxkbswitch.so.1.8.5 \
 		man/man1/xkb-switch.1.gz
 
 PORTDOCS=	README.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11/xkb-switch/distinfo
===================================================================
--- head/x11/xkb-switch/distinfo	(revision 566157)
+++ head/x11/xkb-switch/distinfo	(revision 566158)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1564084605
-SHA256 (ierton-xkb-switch-1.6.0_GH0.tar.gz) = 17ddd00a09945f634654ddf98d55023b0727755f828706747fd5227e2651633d
-SIZE (ierton-xkb-switch-1.6.0_GH0.tar.gz) = 20458
+TIMESTAMP = 1613823495
+SHA256 (ierton-xkb-switch-1.8.5_GH0.tar.gz) = 89e7cc64a3bfc481b0e341b79320de4f0adbdba49b551988fe4bf02f6ae9e003
+SIZE (ierton-xkb-switch-1.8.5_GH0.tar.gz) = 21356
 SHA256 (2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch) = 8dce584225bea7340a3674d9ab4ed66912ee4354f7e40f941625c90b8b66d5e1
 SIZE (2075a8cdd5456c906fcd49278c1003dcb6b9f880.patch) = 1845