diff --git a/games/godot/Makefile b/games/godot/Makefile
index 2425a970836..b2e5fc66786 100644
--- a/games/godot/Makefile
+++ b/games/godot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2021/11/10 13:20:17 jca Exp $
+# $OpenBSD: Makefile,v 1.30 2021/12/11 11:44:44 op Exp $
 
 BROKEN-powerpc =	fails at runtime, the UI is totally blank
 
@@ -8,6 +8,7 @@ V =		3.4
 GODOTSTEAM_V =	g333-s151-g397
 DISTNAME =	godot-${V}-stable
 PKGNAME =	godot-${V}
+REVISION =	0
 CATEGORIES =	games
 HOMEPAGE =	https://godotengine.org/
 MAINTAINER =	Omar Polo <op@omarpolo.com>
@@ -82,6 +83,7 @@ LIB_DEPENDS =		archivers/zstd \
 			multimedia/libvpx \
 			net/enet \
 			security/polarssl
+RUN_DEPENDS =		devel/desktop-file-utils
 
 NO_TEST =		Yes
 
@@ -107,5 +109,17 @@ pre-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
 		${PREFIX}/bin/godot
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \
+		${PREFIX}/man/man6
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/icon.svg \
+		${PREFIX}/share/pixmaps/godot.svg
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.desktop \
+		${PREFIX}/share/applications
+	${INSTALL_DATA_DIR} ${PREFIX}/share/metainfo
+	${INSTALL_DATA} ${WRKSRC}/misc/dist/linux/*.appdata.xml \
+		${PREFIX}/share/metainfo/
 
 .include <bsd.port.mk>
diff --git a/games/godot/patches/patch-misc_dist_linux_godot_6 b/games/godot/patches/patch-misc_dist_linux_godot_6
new file mode 100644
index 00000000000..f861eefca68
--- /dev/null
+++ b/games/godot/patches/patch-misc_dist_linux_godot_6
@@ -0,0 +1,20 @@
+$OpenBSD: patch-misc_dist_linux_godot_6,v 1.1 2021/12/11 11:44:44 op Exp $
+
+Index: misc/dist/linux/godot.6
+--- misc/dist/linux/godot.6.orig
++++ misc/dist/linux/godot.6
+@@ -1,4 +1,4 @@
+-.TH GODOT "6" "January 2020" "godot 3.2" "Games"
++.TH GODOT "6" "January 2020" "Godot" "Games"
+ .SH NAME
+ godot \- multi\-platform 2D and 3D game engine with a feature\-rich editor
+ .SH SYNOPSIS
+@@ -56,7 +56,7 @@ Remote filesystem (<host/IP>[:<port>] address).
+ Password for remote filesystem.
+ .TP
+ \fB\-\-audio\-driver\fR <driver>
+-Audio driver ('PulseAudio', 'ALSA', 'Dummy').
++Audio driver ('sndio', 'Dummy').
+ .TP
+ \fB\-\-video\-driver\fR <driver>
+ Video driver ('GLES3', 'GLES2').
diff --git a/games/godot/pkg/PLIST b/games/godot/pkg/PLIST
index f90965e2be8..e31f6036bc0 100644
--- a/games/godot/pkg/PLIST
+++ b/games/godot/pkg/PLIST
@@ -1,3 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/11/10 13:20:17 jca Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/12/11 11:44:44 op Exp $
 @bin bin/godot
+@man man/man6/godot.6
+share/applications/org.godotengine.Godot.desktop
 share/doc/pkg-readmes/${PKGSTEM}
+share/metainfo/
+share/metainfo/org.godotengine.Godot.appdata.xml
+share/pixmaps/
+share/pixmaps/godot.svg
+@tag update-desktop-database