diff --git a/x11/gxkb/Makefile b/x11/gxkb/Makefile
index 700d05b487f0..ebbf6b34fe16 100644
--- a/x11/gxkb/Makefile
+++ b/x11/gxkb/Makefile
@@ -1,41 +1,46 @@
 PORTNAME=	gxkb
-PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTVERSION=	0.9.5
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}
+# RU and BY flags were removed as of version 0.9.4 so we need two distfiles
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-0.9.3${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	X11 keyboard layout indicator and switcher
 WWW=		https://zen-tools.github.io/gxkb/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 USES=		gnome pkgconfig
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	gdkpixbuf2 glib20
 
 PORTDOCS=	AUTHORS NEWS
 
-PORTSCOUT=	skipv:0.9.4	# identical to 0.9.3 but RU and BY flags removed
-
 OPTIONS_DEFINE=	DOCS GTK2
 GTK2_DESC=	Build against GTK version 2, not 3
 
 GTK2_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gtk2
 GTK2_LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck
 GTK2_LIB_DEPENDS_OFF=	libwnck-3.so:x11-toolkits/libwnck3
 GTK2_USES=		autoreconf
 GTK2_USE=		GNOME=gtk20
 GTK2_USE_OFF=		GNOME=gtk30
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/^doc_DATA/s, C[^ ]*,,g' \
 		${WRKSRC}/doc/Makefile.[ai][mn]
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s, doc,,' ${WRKSRC}/Makefile.in
 
+post-install:
+.for c in by ru
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-0.9.3/data/flags/${c}.png \
+		${STAGEDIR}${DATADIR}/flags
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/gxkb/distinfo b/x11/gxkb/distinfo
index 37feb89b8569..ecda7d3238be 100644
--- a/x11/gxkb/distinfo
+++ b/x11/gxkb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1635019903
+TIMESTAMP = 1707253056
+SHA256 (gxkb-0.9.5.tar.gz) = 255af5516a5b39acb0cd2a821404833decce00c2bfee42e2d68dfb461d18c82f
+SIZE (gxkb-0.9.5.tar.gz) = 236124
 SHA256 (gxkb-0.9.3.tar.gz) = ef0bbea5f40051e57ca35f304a91ff296044029913cd4d07470fd26b5204d831
 SIZE (gxkb-0.9.3.tar.gz) = 174152
diff --git a/x11/gxkb/pkg-plist b/x11/gxkb/pkg-plist
index fd8ac420c216..16c10cd6e8e2 100644
--- a/x11/gxkb/pkg-plist
+++ b/x11/gxkb/pkg-plist
@@ -1,39 +1,103 @@
 bin/gxkb
 share/applications/gxkb.desktop
+%%DATADIR%%/flags/af.png
+%%DATADIR%%/flags/al.png
 %%DATADIR%%/flags/am.png
+%%DATADIR%%/flags/at.png
+%%DATADIR%%/flags/au.png
+%%DATADIR%%/flags/az.png
+%%DATADIR%%/flags/ba.png
+%%DATADIR%%/flags/bd.png
+%%DATADIR%%/flags/be.png
 %%DATADIR%%/flags/bg.png
+%%DATADIR%%/flags/br.png
+%%DATADIR%%/flags/bt.png
+%%DATADIR%%/flags/bw.png
 %%DATADIR%%/flags/by.png
+%%DATADIR%%/flags/ca.png
+%%DATADIR%%/flags/cd.png
+%%DATADIR%%/flags/ch.png
+%%DATADIR%%/flags/cm.png
+%%DATADIR%%/flags/cn.png
 %%DATADIR%%/flags/cz.png
 %%DATADIR%%/flags/cz_qwerty.png
 %%DATADIR%%/flags/de.png
+%%DATADIR%%/flags/dk.png
+%%DATADIR%%/flags/dz.png
 %%DATADIR%%/flags/ee.png
+%%DATADIR%%/flags/eg.png
 %%DATADIR%%/flags/epo.png
 %%DATADIR%%/flags/es.png
+%%DATADIR%%/flags/et.png
+%%DATADIR%%/flags/eu.png
 %%DATADIR%%/flags/fi.png
+%%DATADIR%%/flags/fo.png
 %%DATADIR%%/flags/fr.png
 %%DATADIR%%/flags/gb.png
 %%DATADIR%%/flags/ge.png
+%%DATADIR%%/flags/gh.png
+%%DATADIR%%/flags/gn.png
 %%DATADIR%%/flags/gr.png
 %%DATADIR%%/flags/hr.png
 %%DATADIR%%/flags/hu.png
+%%DATADIR%%/flags/id.png
+%%DATADIR%%/flags/ie.png
+%%DATADIR%%/flags/il.png
+%%DATADIR%%/flags/in.png
+%%DATADIR%%/flags/iq.png
+%%DATADIR%%/flags/ir.png
 %%DATADIR%%/flags/is.png
 %%DATADIR%%/flags/it.png
+%%DATADIR%%/flags/jp.png
+%%DATADIR%%/flags/ke.png
+%%DATADIR%%/flags/kg.png
+%%DATADIR%%/flags/kh.png
+%%DATADIR%%/flags/kr.png
 %%DATADIR%%/flags/kz.png
+%%DATADIR%%/flags/la.png
+%%DATADIR%%/flags/lk.png
 %%DATADIR%%/flags/lt.png
 %%DATADIR%%/flags/lv.png
+%%DATADIR%%/flags/ma.png
+%%DATADIR%%/flags/md.png
+%%DATADIR%%/flags/me.png
+%%DATADIR%%/flags/mk.png
+%%DATADIR%%/flags/ml.png
+%%DATADIR%%/flags/mm.png
+%%DATADIR%%/flags/mn.png
+%%DATADIR%%/flags/mt.png
+%%DATADIR%%/flags/mv.png
+%%DATADIR%%/flags/my.png
+%%DATADIR%%/flags/ng.png
+%%DATADIR%%/flags/nl.png
 %%DATADIR%%/flags/no.png
+%%DATADIR%%/flags/np.png
+%%DATADIR%%/flags/nz.png
+%%DATADIR%%/flags/ph.png
+%%DATADIR%%/flags/pk.png
 %%DATADIR%%/flags/pl.png
 %%DATADIR%%/flags/pt.png
 %%DATADIR%%/flags/ro.png
+%%DATADIR%%/flags/rs.png
 %%DATADIR%%/flags/ru.png
 %%DATADIR%%/flags/se.png
 %%DATADIR%%/flags/si.png
 %%DATADIR%%/flags/sk.png
-%%DATADIR%%/flags/sr.png
+%%DATADIR%%/flags/sn.png
+%%DATADIR%%/flags/sy.png
+%%DATADIR%%/flags/tg.png
+%%DATADIR%%/flags/th.png
+%%DATADIR%%/flags/tj.png
+%%DATADIR%%/flags/tm.png
+%%DATADIR%%/flags/tr.png
+%%DATADIR%%/flags/tw.png
+%%DATADIR%%/flags/tz.png
 %%DATADIR%%/flags/ua.png
 %%DATADIR%%/flags/us.png
 %%DATADIR%%/flags/uz.png
+%%DATADIR%%/flags/vn.png
+%%DATADIR%%/flags/za.png
 %%DATADIR%%/flags/zz.png
 %%DATADIR%%/logo.png
 share/man/man1/gxkb.1.gz
 share/pixmaps/gxkb.xpm