diff --git a/games/godot/Makefile b/games/godot/Makefile
index ec50c4a68235..29887c21c3d2 100644
--- a/games/godot/Makefile
+++ b/games/godot/Makefile
@@ -3,18 +3,16 @@ BROKEN-powerpc =	fails at runtime, the UI is totally blank
 COMMENT-main =	2D and 3D game engine
 COMMENT-tools=	2D and 3D game engine (with tools)
 
-V =		3.4.4
+V =		3.4.5
 GODOTSTEAM_V =	g34-s152-gs311
 DISTNAME =	godot-${V}-stable
 PKGNAME =	godot-${V}
-REVISION-main =	3
-REVISION-tools = 1
 
 CATEGORIES =	games
 
 HOMEPAGE =	https://godotengine.org/
 
-MAINTAINER =	Omar Polo <op@omarpolo.com>
+MAINTAINER =	Omar Polo <op@openbsd.org>
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -22,10 +20,12 @@ PERMIT_PACKAGE =	Yes
 MULTI_PACKAGES =	-main -tools
 
 WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
-WANTLIB += LinearMath GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
-WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
-WANTLIB += theoradec usbhid vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
+WANTLIB += GL LinearMath X11 X11-xcb Xau Xcursor Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm c drm enet execinfo
+WANTLIB += freetype intl m mbedcrypto mbedtls mbedx509 mpcdec
+WANTLIB += ogg opus opusfile pcre2-32 png sndio steam_api theora
+WANTLIB += theoradec usbhid vorbis vorbisfile vpx webp xcb xcb-dri2
+WANTLIB += xcb-glx z zstd
 
 WANTLIB-tools = ${WANTLIB}
 
@@ -39,7 +39,7 @@ DISTFILES =     ${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_SUFX =	.tar.xz
 DIST_SUBDIR =   ${PKGNAME}
 
-MODULES =		devel/scons
+MODULES =	devel/scons
 
 # Building with module_mono_enabled requires msbuild and to fix the
 # sharedlib_ext in modules/mono/config.py to '.so.1.0'
diff --git a/games/godot/distinfo b/games/godot/distinfo
index 7a15a59eb3e5..44c941266daa 100644
--- a/games/godot/distinfo
+++ b/games/godot/distinfo
@@ -1,4 +1,4 @@
-SHA256 (godot-3.4.4/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
-SHA256 (godot-3.4.4/godot-3.4.4-stable.tar.xz) = m7pqixkVAwTyICsB4Eeg9lnFyAh0JN7JyuDpRCtWrdc=
-SIZE (godot-3.4.4/g34-s152-gs311.tar.gz) = 197461
-SIZE (godot-3.4.4/godot-3.4.4-stable.tar.xz) = 22417584
+SHA256 (godot-3.4.5/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
+SHA256 (godot-3.4.5/godot-3.4.5-stable.tar.xz) = GFfMsNSEchFmS5RMj+rtGDLJhFoPHlqohhNt5mEQo4g=
+SIZE (godot-3.4.5/g34-s152-gs311.tar.gz) = 197461
+SIZE (godot-3.4.5/godot-3.4.5-stable.tar.xz) = 22630816
diff --git a/games/godot/patches/patch-drivers_unix_os_unix_cpp b/games/godot/patches/patch-drivers_unix_os_unix_cpp
index 9572fa175deb..b90a37a84da9 100644
--- a/games/godot/patches/patch-drivers_unix_os_unix_cpp
+++ b/games/godot/patches/patch-drivers_unix_os_unix_cpp
@@ -1,16 +1,27 @@
+fix get_executable_path on OpenBSD; backport of
+https://github.com/godotengine/godot/pull/61540
+
 Index: drivers/unix/os_unix.cpp
 --- drivers/unix/os_unix.cpp.orig
 +++ drivers/unix/os_unix.cpp
-@@ -483,11 +483,7 @@ String OS_Unix::get_executable_path() const {
+@@ -482,12 +482,6 @@ String OS_Unix::get_executable_path() const {
+ 		return OS::get_executable_path();
  	}
  	return b;
- #elif defined(__OpenBSD__) || defined(__NetBSD__)
+-#elif defined(__OpenBSD__) || defined(__NetBSD__)
 -	char resolved_path[MAXPATHLEN];
 -
 -	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
 -
 -	return String(resolved_path);
-+	return OS::get_executable_path();
  #elif defined(__FreeBSD__)
  	int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
  	char buf[MAXPATHLEN];
+@@ -514,7 +508,6 @@ String OS_Unix::get_executable_path() const {
+ 
+ 	return path;
+ #else
+-	ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly.");
+ 	return OS::get_executable_path();
+ #endif
+ }
diff --git a/games/godot/patches/patch-platform_x11_detect_py b/games/godot/patches/patch-platform_x11_detect_py
index 1a5cd868a536..d2085ded91ad 100644
--- a/games/godot/patches/patch-platform_x11_detect_py
+++ b/games/godot/patches/patch-platform_x11_detect_py
@@ -35,8 +35,8 @@ Index: platform/x11/detect.py
 -
      ## Architecture
  
-     is64 = sys.maxsize > 2 ** 32
-@@ -331,6 +308,10 @@ def configure(env):
+     is64 = sys.maxsize > 2**32
+@@ -332,6 +309,10 @@ def configure(env):
      else:
          print("Warning: ALSA libraries not found. Disabling the ALSA audio driver.")
  
@@ -47,7 +47,7 @@ Index: platform/x11/detect.py
      if env["pulseaudio"]:
          if os.system("pkg-config --exists libpulse") == 0:  # 0 means found
              env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED"])
-@@ -348,6 +329,9 @@ def configure(env):
+@@ -350,6 +331,9 @@ def configure(env):
      else:
          env["udev"] = False  # Linux specific
  
@@ -57,7 +57,7 @@ Index: platform/x11/detect.py
      # Linkflags below this line should typically stay the last ones
      if not env["builtin_zlib"]:
          env.ParseConfig("pkg-config zlib --cflags --libs")
-@@ -375,11 +359,6 @@ def configure(env):
+@@ -380,11 +364,6 @@ def configure(env):
              print(
                  "Warning: Creating template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold or LLD."
              )
diff --git a/games/godot/patches/patch-platform_x11_os_x11_cpp b/games/godot/patches/patch-platform_x11_os_x11_cpp
index a90ae2b5b58f..a833853a0456 100644
--- a/games/godot/patches/patch-platform_x11_os_x11_cpp
+++ b/games/godot/patches/patch-platform_x11_os_x11_cpp
@@ -22,7 +22,7 @@ Index: platform/x11/os_x11.cpp
  #endif
  
  	power_manager = memnew(PowerX11);
-@@ -4056,6 +4056,11 @@ void OS_X11::update_real_mouse_position() {
+@@ -4110,6 +4110,11 @@ void OS_X11::update_real_mouse_position() {
  }
  
  OS_X11::OS_X11() {
diff --git a/games/godot/patches/patch-thirdparty_embree_common_math_math_h b/games/godot/patches/patch-thirdparty_embree_common_math_math_h
index e1b405a1337c..817348539748 100644
--- a/games/godot/patches/patch-thirdparty_embree_common_math_math_h
+++ b/games/godot/patches/patch-thirdparty_embree_common_math_math_h
@@ -1,6 +1,6 @@
 add an implementation for max for long (ssize_t are long typedef'ed).
 Otherwise it will fail in parallel_partition.h:185 due to an ambiguous
-call.
+call.  Backport of https://github.com/embree/embree/pull/379
 
 Index: thirdparty/embree/common/math/math.h
 --- thirdparty/embree/common/math/math.h.orig
diff --git a/games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp b/games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
index 7ffe1326006f..c84b7a2a33e6 100644
--- a/games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
+++ b/games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
@@ -1,3 +1,5 @@
+Backport of https://github.com/embree/embree/pull/379
+
 1. we don't seem to have pthread_getaffinity_np in pthread_np.h; use sysctl
    like macos and android then.
 2. just fake getExecutableFileName and get{Virtual,Resident}MemoryBytes