diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile
index eaccbc9a5071..e556976534db 100644
--- a/x11/bemenu/Makefile
+++ b/x11/bemenu/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	bemenu
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	x11 wayland
+MASTER_SITES=	https://github.com/Cloudef/bemenu/releases/download/${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Dynamic menu library and client program inspired by dmenu
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE-CLIENT
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSE-LIB
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Cloudef
 USE_LDCONFIG=	yes
-
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ARGS=	RENDERERS="${_BEMENU_RENDERERS}" \
 		VERSION=${DISTVERSION}
+WRKSRC=		${WRKDIR}/${DISTVERSION}
 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
 NCURSES_MAKE_ARGS=	curses_CFLAGS="-I${NCURSESINC}" \
 			curses_LIBS="-L${NCURSESLIB} -l${NCURSES_IMPL}"
 NCURSES_VARS=		_BEMENU_RENDERERS+=curses
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libwayland-client.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		gnome pkgconfig
 WAYLAND_USE=		GNOME=cairo,glib20,pango
 WAYLAND_VARS=		_BEMENU_RENDERERS+=wayland
 X11_USES=		gnome pkgconfig xorg
 X11_USE=		GNOME=cairo,glib20,pango \
 			XORG=x11,xinerama
 X11_VARS=		_BEMENU_RENDERERS+=x11
 
 .include <bsd.port.mk>
diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo
index 819bb5b3cbbb..fca2405f7aa1 100644
--- a/x11/bemenu/distinfo
+++ b/x11/bemenu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593867098
-SHA256 (Cloudef-bemenu-0.5.0_GH0.tar.gz) = 56e4a0bd06f93e7dfcdabbf7ee1ed973ce4e77d648132064f26f30662c4055f1
-SIZE (Cloudef-bemenu-0.5.0_GH0.tar.gz) = 110749
+TIMESTAMP = 1621533026
+SHA256 (bemenu-0.6.0.tar.gz) = b4344b8b1a4762d71167c1d753e6c4dc4603ec64ffe411cc2c8e5fddcbb653ce
+SIZE (bemenu-0.6.0.tar.gz) = 118057
diff --git a/x11/bemenu/files/Makefile b/x11/bemenu/files/Makefile
index aa4eeee62d6b..45f5cacf4bdf 100644
--- a/x11/bemenu/files/Makefile
+++ b/x11/bemenu/files/Makefile
@@ -1,52 +1,56 @@
 BEMENU_LIB=	libbemenu.so.${VERSION}
 wayland_PC=	epoll-shim pangocairo wayland-client xkbcommon
 x11_PC=		pangocairo x11 xinerama
 CFLAGS+=	-DBM_VERSION="\"${VERSION}\"" -DBM_PLUGIN_VERSION="\"${VERSION}-nogit\"" -DINSTALL_LIBDIR="\"${PREFIX}/lib\"" -std=c99 -fPIC -pthread -Ilib ${:!pkg-config --cflags ${RENDERERS:@r@${${r}_PC}@}!} ${RENDERERS:@r@${${r}_CFLAGS}@}
 LDFLAGS+=	-Wl,--no-undefined -pthread
 
-all: bemenu bemenu-run bemenu.pc ${RENDERERS:@r@bemenu-renderer-${r}.so@}
+all: bemenu bemenu.1 bemenu-run bemenu.pc ${RENDERERS:@r@bemenu-renderer-${r}.so@}
 ${BEMENU_LIB}: lib/3rdparty/cdl.o lib/filter.o lib/item.o lib/library.o lib/list.o lib/menu.o lib/util.o
 bemenu: client/bemenu.o client/common/common.o
 bemenu-run: client/bemenu-run.o client/common/common.o
 bemenu-renderer-curses.so: lib/renderers/curses/curses.o
-wayland_OBJS=	lib/renderers/wayland/registry.o lib/renderers/wayland/wayland.o lib/renderers/wayland/window.o lib/renderers/wayland/wlr-layer-shell-unstable-v1.o lib/renderers/wayland/xdg-shell.o
+wayland_OBJS=	lib/renderers/wayland/registry.o lib/renderers/wayland/wayland.o lib/renderers/wayland/window.o lib/renderers/wayland/wlr-layer-shell-unstable-v1.o lib/renderers/wayland/xdg-output-unstable-v1.o lib/renderers/wayland/xdg-shell.o
 bemenu-renderer-wayland.so: ${wayland_OBJS}
-${wayland_OBJS}: lib/renderers/wayland/wlr-layer-shell-unstable-v1.h
+${wayland_OBJS}: lib/renderers/wayland/wlr-layer-shell-unstable-v1.h lib/renderers/wayland/xdg-output-unstable-v1.h
 bemenu-renderer-x11.so: lib/renderers/x11/window.o lib/renderers/x11/x11.o lib/renderers/x11/xkb_unicode.o
 
 .SUFFIXES: .xml
 .xml.c .xml.h:
 	wayland-scanner ${"${@:M*.h}"!="":?client-header:private-code} < $< > $@
 
 lib/renderers/wayland/xdg-shell.xml:
 	cp "`pkg-config --variable=pkgdatadir wayland-protocols`/stable/${@:T:R}/${@:T}" $@
 
 ${BEMENU_LIB}:
 	${CC} ${LDFLAGS} -fPIC -shared -Wl,-soname=${BEMENU_LIB:R:R} -o $@ $>
 
 bemenu bemenu-run: ${BEMENU_LIB}
 	${CC} ${LDFLAGS} -o $@ $>
 
 bemenu-renderer-curses.so bemenu-renderer-wayland.so bemenu-renderer-x11.so: ${BEMENU_LIB}
 	${CC} ${LDFLAGS} -fPIC -shared -o $@ $> ${${@:R:S,-, ,g:[3]}_LIBS} ${${@:R:S,-, ,g:[3]}_PC:D`pkg-config --libs ${${@:R:S,-, ,g:[3]}_PC}`} -lm
 
 bemenu.pc: bemenu.pc.in
 	sed -e 's,@LIBDIR@,/lib,' -e 's,@PREFIX@,${PREFIX},' -e 's,@VERSION@,${VERSION},' $> > $@
 	echo 'includedir=$${prefix}/include' >> $@
 	echo 'Cflags: -I$${includedir}' >> $@
 	cat $@
 
+bemenu.1: man/bemenu.1.in
+	sed 's,@LIBDIR@,${PREFIX}/lib,' $> > $@
+
 install:
 	@mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/include ${DESTDIR}${PREFIX}/lib ${DESTDIR}${PREFIX}/libdata/pkgconfig ${DESTDIR}${PREFIX}/share/man/man1
 	${BSD_INSTALL_PROGRAM} bemenu bemenu-run ${DESTDIR}${PREFIX}/bin
 	${BSD_INSTALL_DATA} lib/bemenu.h ${DESTDIR}${PREFIX}/include
 	${BSD_INSTALL_LIB} ${BEMENU_LIB} ${DESTDIR}${PREFIX}/lib
 	cd ${DESTDIR}${PREFIX}/lib && \
 		ln -sf ${BEMENU_LIB} ${BEMENU_LIB:R:R} && \
 		ln -sf ${BEMENU_LIB:R:R} ${BEMENU_LIB:R:R:R}
 .if !empty(RENDERERS)
 	@mkdir -p ${DESTDIR}${PREFIX}/lib/bemenu
 	${BSD_INSTALL_LIB} bemenu-renderer-*.so ${DESTDIR}${PREFIX}/lib/bemenu
 .endif
 	${BSD_INSTALL_DATA} bemenu.pc ${DESTDIR}${PREFIX}/libdata/pkgconfig
-	${BSD_INSTALL_MAN} man/*.1 ${DESTDIR}${PREFIX}/share/man/man1
+	${BSD_INSTALL_MAN} bemenu.1 ${DESTDIR}${PREFIX}/share/man/man1
+	ln ${DESTDIR}${PREFIX}/share/man/man1/bemenu.1 ${DESTDIR}${PREFIX}/share/man/man1/bemenu-run.1