diff --git a/common/shlibs b/common/shlibs
index b0783e30ecb..ccfd187bfe0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3731,7 +3731,7 @@ libflite.so.1 flite-2.1_1
 libflite_cmu_us_kal.so.1 flite-2.1_1
 libflite_usenglish.so.1 flite-2.1_1
 libflite_cmulex.so.1 flite-2.1_1
-libgtk-4.so.0.9400.0 gtk4-3.94.0_1
+libgtk-4.so.0 gtk4-3.99.1_1
 libmodule.so.5 libmodule-5.0.0_1
 libgnustep-gui.so.0.28 gnustep-gui-0.28.0_1
 libmhash.so.2 mhash-0.9.9.9_1
diff --git a/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch b/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch
deleted file mode 100644
index 7275e958bba..00000000000
--- a/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/gdkvulkancontext.c	2018-06-26 13:48:16.000000000 +0200
-+++ gdk/gdkvulkancontext.c	2020-07-26 16:28:33.487718532 +0200
-@@ -190,7 +190,9 @@
-     case VK_ERROR_FRAGMENTATION_EXT:
-       return "A descriptor pool creation has failed due to fragmentation";
- #endif
-+#if defined(VK_RESULT_RANGE_SIZE)
-     case VK_RESULT_RANGE_SIZE:
-+#endif
-     case VK_RESULT_MAX_ENUM:
-     default:
-       return "Unknown Vulkan error.";
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 58388b515c0..a917e2bfc27 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,8 +1,8 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=3.94.0
-revision=2
-wrksrc="gtk+-${version}"
+version=3.99.1
+revision=1
+wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
@@ -11,11 +11,12 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir true false)
  -Dprint-backends=$(vopt_if cups 'cups,file' file)
- -Dcolord=$(vopt_if colord yes no)
- -Dcloudproviders=$(vopt_if cloudproviders true false)
- -Dvulkan=$(vopt_if vulkan yes no)"
+ -Dcolord=$(vopt_if colord enabled disabled)
+ -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
 hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
+ pkg-config sassc gettext
+ $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
@@ -27,8 +28,8 @@ short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
-distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=a947caa5296610b0f1d7a03b58df34765c227c577c78e683e75eea3251a67035
+distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
+checksum=9b444e1ce3728680290917e143930195599c65c84c4debbfacfc1044aeff3c94
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
@@ -56,11 +57,26 @@ gtk4-demo_package() {
 		vmove usr/bin/gtk4-demo
 		vmove usr/bin/gtk4-widget-factory
 		vmove usr/bin/gtk4-demo-application
-		vmove usr/share/gtk-4.0/gtkbuilder.rng
-		vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
-		vmove usr/share/applications/gtk4-widget-factory.desktop
-		vmove usr/share/applications/gtk4-demo.desktop
-		vmove usr/share/icons
+		vmove usr/share/gtk-4.0/gtk4builder.rng
+		vmove usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+
+		# gtk3-icon-browser is in main package,
+		# keep gtk4-icon-browser in main package too
+		vmove usr/share/man/man1/gtk4-demo-application.1
+
+		vmove usr/share/applications/org.gtk.Demo4.desktop
+		vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Demo4.svg
+		vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg
+		vmove usr/share/man/man1/gtk4-demo.1
+
+		vmove usr/share/applications/org.gtk.PrintEditor4.desktop
+		vmove usr/share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.svg
+		vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
+		vmove usr/share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg
+		vmove usr/share/applications/org.gtk.WidgetFactory4.desktop
+		vmove usr/share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
+		vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
+		vmove usr/share/man/man1/gtk4-widget-factory.1
 	}
 }
 
@@ -68,5 +84,6 @@ gtk4-update-icon-cache_package() {
 	short_desc+=" - GTK4 update icon cache tool"
 	pkg_install() {
 		vmove usr/bin/gtk4-update-icon-cache
+		vmove usr/share/man/man1/gtk4-update-icon-cache.1
 	}
 }