diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile
index b24264e5aa03..9bee3909a9dd 100644
--- a/x11/nwg-menu/Makefile
+++ b/x11/nwg-menu/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	nwg-menu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	MenuStart plugin to nwg-panel, also capable of working standalone
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 
 USES=		gnome go:modules pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 GH_ACCOUNT=	nwg-piotr
 GH_TUPLE=	allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
 		dlasky:gotk3-layershell:5cca0b819261:dlasky_gotk3_layershell/vendor/github.com/dlasky/gotk3-layershell \
 		golang:sync:56d357773e84:golang_sync/vendor/golang.org/x/sync \
 		gotk3:gotk3:v0.6.0:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \
 		joshuarubin:go-sway:v0.0.4:joshuarubin_go_sway/vendor/github.com/joshuarubin/go-sway \
 		joshuarubin:lifecycle:v1.0.0:joshuarubin_lifecycle/vendor/github.com/joshuarubin/lifecycle \
 		uber-go:atomic:v1.3.2:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:multierr:v1.1.0:uber_go_multierr/vendor/go.uber.org/multierr
 CGO_LDFLAGS+=	-Wl,--as-needed # harfbuzz, freetype2
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	desktop-directories *.css
 
 post-patch:
 # Respect PREFIX for *.desktop and system configs
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/main.go \
 		${WRKSRC}/tools.go
 
 post-install:
 # Based on install from WRKSRC/Makefile
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
 		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/x11/nwg-menu/files/patch-main.go b/x11/nwg-menu/files/patch-main.go
new file mode 100644
index 000000000000..72ee9595779e
--- /dev/null
+++ b/x11/nwg-menu/files/patch-main.go
@@ -0,0 +1,15 @@
+- Adapt to BSD-style shutdown
+
+--- main.go.orig	2021-06-19 23:37:36 UTC
++++ main.go
+@@ -119,8 +119,8 @@ var fileManager = flag.String("fm", "thunar", "File Ma
+ var term = flag.String("term", "alacritty", "Terminal emulator")
+ var cmdLock = flag.String("cmd-lock", "swaylock -f -c 000000", "screen lock command")
+ var cmdLogout = flag.String("cmd-logout", "swaymsg exit", "logout command")
+-var cmdRestart = flag.String("cmd-restart", "systemctl reboot", "reboot command")
+-var cmdShutdown = flag.String("cmd-shutdown", "systemctl -i poweroff", "shutdown command")
++var cmdRestart = flag.String("cmd-restart", "shutdown -r now", "reboot command")
++var cmdShutdown = flag.String("cmd-shutdown", "shutdown -p now", "shutdown command")
+ 
+ func main() {
+ 	timeStart := time.Now()