diff --git a/x11/pmenu/Makefile b/x11/pmenu/Makefile
index ba34c465ed5e..8753e3f3b22f 100644
--- a/x11/pmenu/Makefile
+++ b/x11/pmenu/Makefile
@@ -1,44 +1,49 @@
 PORTNAME=	pmenu
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.0
-PORTREVISION=	3
+DISTVERSION=	3.1.1
 CATEGORIES=	x11
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+# aee4d6665c9208a25b3d75410d6a485d74575f68 --> https://github.com/phillbush/pmenu/pull/19
+# e3efbb5923f638b38087a3f616906d9d4fdaf6f2 --> https://github.com/phillbush/pmenu/pull/20
+PATCHFILES=	aee4d6665c9208a25b3d75410d6a485d74575f68.patch:-p1 \
+		e3efbb5923f638b38087a3f616906d9d4fdaf6f2.patch:-p1
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Pie menu for X
 WWW=		https://github.com/phillbush/pmenu
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libImlib2.so:graphics/imlib2
 
-USES=		localbase xorg
+USES=		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	phillbush
 USE_XORG=	x11 xext xft xinerama xrender
 
-MAKE_ARGS=	CC="${CC}" \
-		FREETYPEINC="${LOCALBASE}/include/freetype2" \
+MAKE_ARGS=	FREETYPEINC="${LOCALBASE}/include/freetype2" \
 		LOCALINC="${LOCALBASE}/include" \
 		LOCALLIB="${LOCALBASE}/lib" \
 		PREFIX="${PREFIX}" \
 		X11INC="${LOCALBASE}/include/xorg" \
 		X11LIB="${LOCALBASE}/lib/xorg"
 
+CPPFLAGS+=	-D_XOPEN_SOURCE=700
+
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 PORTEXAMPLES=	${PORTNAME}.sh
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/pmenu/distinfo b/x11/pmenu/distinfo
index 7f07d5ad6449..488c96b2c72a 100644
--- a/x11/pmenu/distinfo
+++ b/x11/pmenu/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1642968652
-SHA256 (phillbush-pmenu-v2.5.0_GH0.tar.gz) = 68f1966d0099d35c443d044a2f2f629a5b078f0fb7b5d5dac5976f119b3215a4
-SIZE (phillbush-pmenu-v2.5.0_GH0.tar.gz) = 18535
+TIMESTAMP = 1789732593
+SHA256 (phillbush-pmenu-v3.1.1_GH0.tar.gz) = f1b70c28e9efd4acbb85358b1522f8c84a651f18f3b9d7158ccc09be038fbd57
+SIZE (phillbush-pmenu-v3.1.1_GH0.tar.gz) = 25414
+SHA256 (aee4d6665c9208a25b3d75410d6a485d74575f68.patch) = 6ca0278c2284eb467fe9d717684ff2576dedaddd60b82d1d33cc750dad8ce69c
+SIZE (aee4d6665c9208a25b3d75410d6a485d74575f68.patch) = 557
+SHA256 (e3efbb5923f638b38087a3f616906d9d4fdaf6f2.patch) = 5e6bce6311a70443116725f6a07b0228c0bc4713f100f4eba49e0078b9fad312
+SIZE (e3efbb5923f638b38087a3f616906d9d4fdaf6f2.patch) = 961
diff --git a/x11/pmenu/files/patch-config.mk b/x11/pmenu/files/patch-config.mk
deleted file mode 100644
index 338ff92e9d99..000000000000
--- a/x11/pmenu/files/patch-config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- config.mk.orig	2021-10-13 18:48:49 UTC
-+++ config.mk
-@@ -16,12 +16,12 @@ FREETYPEINC = /usr/include/freetype2
- #FREETYPEINC = ${X11INC}/freetype2
- 
- # includes and libs
--INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXrender -lXext -lImlib2
-+INCS += -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
-+LIBS += -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11 -lXinerama -lXrender -lXext -lImlib2
- 
- # flags
--CFLAGS = -Wall -Wextra ${INCS} ${CPPFLAGS}
--LDFLAGS = ${LIBS}
-+CFLAGS += -Wall -Wextra ${INCS} ${CPPFLAGS}
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
- CC = cc