diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile
index cdeb2cef680e..f01dcef62dfb 100644
--- a/x11/bemenu/Makefile
+++ b/x11/bemenu/Makefile
@@ -1,59 +1,58 @@
 PORTNAME=	bemenu
-DISTVERSION=	0.6.20
+DISTVERSION=	0.6.21
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/Cloudef/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Dynamic menu library and client program inspired by dmenu
 WWW=		https://github.com/Cloudef/bemenu
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE-CLIENT
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSE-LIB
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		gmake
-USE_GITHUB=	yes
-GH_ACCOUNT=	Cloudef
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	clients
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_BACKEND}
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	NCURSES WAYLAND X11
 OPTIONS_SUB=		yes
 
 BACKEND_DESC=	Backend
 
 NCURSES_USES=		ncurses:base
 NCURSES_ALL_TARGET=	curses
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		gnome pkgconfig
 WAYLAND_USE=		GNOME=cairo,glib20,pango
 WAYLAND_ALL_TARGET=	wayland
 X11_USES=		gnome pkgconfig xorg
 X11_USE=		GNOME=cairo,glib20,pango \
 			XORG=x11,xinerama
 X11_ALL_TARGET=		x11
 
 post-extract:
 	${REINPLACE_CMD} -e 's,$$(shell $$(PKG_CONFIG) --libs ncursesw),${NCURSES_LIB},' \
 		${WRKSRC}/${MAKEFILE}
 	${REINPLACE_CMD} -e 's,$$(shell $$(PKG_CONFIG) --cflags-only-I ncursesw),,' \
 		${WRKSRC}/${MAKEFILE}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-run
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${DISTVERSION}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so
 
 .include <bsd.port.mk>
diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo
index 1f19b38b2f48..a503eb86466b 100644
--- a/x11/bemenu/distinfo
+++ b/x11/bemenu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710276097
-SHA256 (Cloudef-bemenu-0.6.20_GH0.tar.gz) = abd8ec1f496d2ca7df1f1afe13cb44143279ba761e130bc4324d6fdb23753bba
-SIZE (Cloudef-bemenu-0.6.20_GH0.tar.gz) = 139810
+TIMESTAMP = 1710682464
+SHA256 (bemenu-0.6.21.tar.gz) = 86af530620ecf6db3ebc196656b76f0f15350028c9c5a137e975f085dafdfe6e
+SIZE (bemenu-0.6.21.tar.gz) = 140256