diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch
index b3aa4cb7a83..3e57abb45e9 100644
--- a/srcpkgs/godot/patches/10-fix-musl.patch
+++ b/srcpkgs/godot/patches/10-fix-musl.patch
@@ -1,5 +1,5 @@
 --- joystick_linux.cpp  2017-12-12 21:28:08.263329050 +0100
-+++ platform/x11/joystick_linux.cpp     2017-12-12 21:29:25.500336429 +0100
++++ platform/x11/joypad_linux.cpp     2017-12-12 21:29:25.500336429 +0100
 @@ -42,6 +42,10 @@
  #include <libudev.h>
  #endif
@@ -12,3 +12,16 @@
  #define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
  #define NBITS(x) ((((x)-1) / LONG_BITS) + 1)
 
+diff --git thirdparty/thekla_atlas/nvmath/nvmath.h thirdparty/thekla_atlas/nvmath/nvmath.h
+index f2b6942..5b15bd1 100644
+--- thirdparty/thekla_atlas/nvmath/nvmath.h
++++ thirdparty/thekla_atlas/nvmath/nvmath.h
+@@ -196,7 +196,7 @@ namespace nv
+     {
+ #if NV_OS_WIN32 || NV_OS_XBOX || NV_OS_DURANGO
+         return _isnan(f) != 0;
+-#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || NV_OS_ORBIS
++#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || NV_OS_ORBIS || !defined(__GLIBC__)
+         return isnan(f);
+ #elif NV_OS_LINUX
+         return isnanf(f);
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index ddee9916940..437f6712341 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,19 +1,19 @@
 # Template file for 'godot'
 pkgname=godot
-version=2.1.4
-revision=2
+version=3.0.2
+revision=1
 wrksrc="${pkgname}-${version}-stable"
 build_style=scons
 hostmakedepends="scons pkg-config clang"
 makedepends="
- alsa-lib-devel freetype-devel glu-devel libXcursor-devel
+ alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
  libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel"
 short_desc="A multiplatform 2D and 3D engine"
 maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
+checksum=15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651
 # Godot contains private copies of libraries
 # that already have been packaged elsewhere.
 make_build_args="use_llvm=yes platform=x11 tools=yes target=release_debug colored=yes pulseaudio=no"
@@ -26,6 +26,7 @@ LDFLAGS+=" -pie"
 
 post_extract() {
 	sed -i -e "/openssl_version =/,+4d" platform/x11/detect.py
+	sed -i -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' platform/x11/crash_handler_x11.cpp
 }
 
 do_install() {
diff --git a/srcpkgs/godot/update b/srcpkgs/godot/update
new file mode 100644
index 00000000000..a706f9b4a0b
--- /dev/null
+++ b/srcpkgs/godot/update
@@ -0,0 +1 @@
+pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'