diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 558325eeb1d1..a2d87b8ef50b 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -1,45 +1,39 @@
 # Created by: Jeroen Schot <schot@a-eskwadraat.nl>
 # $FreeBSD$
 
 PORTNAME=	dmenu
-DISTVERSION=	4.9
-PORTREVISION=	1
+DISTVERSION=	4.9-6
+DISTVERSIONSUFFIX=	-g9b38fda
 CATEGORIES=	x11
-MASTER_SITES=	http://dl.suckless.org/tools/ \
-		http://schot.a-eskwadraat.nl/files/
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	X11 menu application designed for the dwm window manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	XINERAMA
 OPTIONS_DEFAULT=	XINERAMA
 
 USES=		xorg
+USE_GITHUB=	yes
+GH_ACCOUNT=	0mp
+GH_PROJECT=	freebsd-${PORTNAME}
 USE_XORG=	x11 xft
 MAKE_ARGS=	CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
 		X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" \
 		FREETYPEINC="${LOCALBASE}/include/freetype2"
 
 PLIST_FILES=	bin/dmenu bin/dmenu_path bin/dmenu_run bin/stest \
 		man/man1/dmenu.1.gz man/man1/stest.1.gz
 
 XINERAMA_USE=	XORG=xinerama
 XINERAMA_MAKE_ARGS_OFF=	XINERAMAFLAGS= XINERAMALIBS=
 
-post-configure:
-	@${REINPLACE_CMD} -E \
-		-e "s|(CFLAGS[[:space:]]*)= |\1+= |" \
-		-e "s|(CPPFLAGS[[:space:]]*)= |\1+= |" \
-		-e "s|(LDFLAGS[[:space:]]*)= |\1+= |" \
-		${WRKSRC}/config.mk
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmenu \
 		${STAGEDIR}${PREFIX}/bin/stest
 
 .include <bsd.port.mk>
diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
index 0c4a9023e37e..eed40dc4c64e 100644
--- a/x11/dmenu/distinfo
+++ b/x11/dmenu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551305095
-SHA256 (dmenu-4.9.tar.gz) = b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945
-SIZE (dmenu-4.9.tar.gz) = 15972
+TIMESTAMP = 1596384435
+SHA256 (0mp-freebsd-dmenu-4.9-6-g9b38fda_GH0.tar.gz) = b111ecec87cdd1191e711ded09ba2d33b4b69fb2cc9ea2b90fd86d64ab87943a
+SIZE (0mp-freebsd-dmenu-4.9-6-g9b38fda_GH0.tar.gz) = 16012
diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk
new file mode 100644
index 000000000000..4d8ca4a684c2
--- /dev/null
+++ b/x11/dmenu/files/patch-config.mk
@@ -0,0 +1,15 @@
+--- config.mk.orig	2020-08-02 16:25:39 UTC
++++ config.mk
+@@ -23,9 +23,9 @@ INCS = -I$(X11INC) -I$(FREETYPEINC)
+ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS   += -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
+ 
+ # compiler and linker
+ CC = cc
diff --git a/x11/dmenu/files/patch-dmenu.c b/x11/dmenu/files/patch-dmenu.c
deleted file mode 100644
index cb3fa2fdc457..000000000000
--- a/x11/dmenu/files/patch-dmenu.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dmenu.c.orig	2019-02-28 14:52:56 UTC
-+++ dmenu.c
-@@ -665,7 +665,7 @@ setup(void)
- 	                XNClientWindow, win, XNFocusWindow, win, NULL);
- 
- 	XMapRaised(dpy, win);
--	XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
-+	/* XSetInputFocus(dpy, win, RevertToParent, CurrentTime); */
- 	if (embed) {
- 		XSelectInput(dpy, parentwin, FocusChangeMask);
- 		if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {