diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile
--- a/x11/bemenu/Makefile
+++ b/x11/bemenu/Makefile
@@ -1,6 +1,7 @@
 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
@@ -15,8 +16,6 @@
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		gmake
-USE_GITHUB=	yes
-GH_ACCOUNT=	Cloudef
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	clients
diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo
--- 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