diff --git a/gtk3/.footprint b/gtk3/.footprint
index a0227003f..9a09095bb 100644
--- a/gtk3/.footprint
+++ b/gtk3/.footprint
@@ -5,6 +5,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gtk-launch
 -rwxr-xr-x	root/root	usr/bin/gtk-query-immodules-3.0
 -rwxr-xr-x	root/root	usr/bin/gtk-query-settings
+-rwxr-xr-x	root/root	usr/bin/gtk-register-3
+-rwxr-xr-x	root/root	usr/bin/gtk-update-icon-cache
 -rwxr-xr-x	root/root	usr/bin/gtk3-demo
 -rwxr-xr-x	root/root	usr/bin/gtk3-demo-application
 -rwxr-xr-x	root/root	usr/bin/gtk3-icon-browser
@@ -425,6 +427,7 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Gtk-3.0.typelib
 drwxr-xr-x	root/root	usr/lib/gtk-3.0/
 drwxr-xr-x	root/root	usr/lib/gtk-3.0/3.0.0/
+-rw-r--r--	root/root	usr/lib/gtk-3.0/3.0.0/immodules.cache
 drwxr-xr-x	root/root	usr/lib/gtk-3.0/3.0.0/immodules/
 -rwxr-xr-x	root/root	usr/lib/gtk-3.0/3.0.0/immodules/im-am-et.la
 -rwxr-xr-x	root/root	usr/lib/gtk-3.0/3.0.0/immodules/im-am-et.so
diff --git a/gtk3/.signature b/gtk3/.signature
index 186ea163a..c306318cc 100644
--- a/gtk3/.signature
+++ b/gtk3/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QR6fYSCi+QJwzdsicfLgZ+8Phf/pV4j05LiwNKsHb9qIBR3tb3ONpeWUkyeYOrbc9fYDiZU1JFS6F72ng3OOwg=
-SHA256 (Pkgfile) = c6b25389766ba67cec11815e7d1a1a44bd2ecd349e4e83389f1d1326a7bdee0f
-SHA256 (.footprint) = 7b87faf6e73c1eaad5ef5acf7f2fb895fdfd7917808787e4f2418138a6767eef
+RWSE3ohX2g5d/XfJ40vMx3qPgwrBvpiUNTkdJegRH/B9EsMi0Dxt8G6QWLe2UVA0roQZ68AqtnZnhwRk4hkHWzoAj2eX4tqyiwM=
+SHA256 (Pkgfile) = 7b9504b71278cc7d16e8ed68f6aa624bd5046745c92370ec422f666c4f571e0e
+SHA256 (.footprint) = 99bd69f98ebefac820102773ddf8949a77f6cbdf3c5972f497465a0759f40602
 SHA256 (gtk+-3.24.24.tar.xz) = cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a
+SHA256 (gtk.immodules) = 1d7ed9a4110e57e6c0caf3daa376007cb4926d205e8165fa3de7c2fa83243f67
+SHA256 (gtk-register-3.sh) = ee9fab456cb6bc816e55ebaa61d095ead47eb1ed6a25eee85f21509fa4e40374
diff --git a/gtk3/Pkgfile b/gtk3/Pkgfile
index 64fae0741..52a9d84b8 100644
--- a/gtk3/Pkgfile
+++ b/gtk3/Pkgfile
@@ -1,21 +1,23 @@
 # Description: A multi-platform toolkit for creating graphical user interfaces
 # URL: https://www.gtk.org/
-# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
-# Depends on: gdk-pixbuf, pango, at-spi2-atk, libepoxy
+# Maintainer: CRUX System Team, core-ports at crux dot nu
+# Depends on: at-spi2-atk gdk-pixbuf libepoxy pango
 
 name=gtk3
 version=3.24.24
-release=1
-source=(https://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz)
+release=2
+source=(https://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz
+	gtk.immodules gtk-register-3.sh)
 
-build () {
+build() {
 	cd gtk+-$version
 
 	./configure --prefix=/usr
-
 	make
 	make DESTDIR=$PKG install
 
+	install -m 0644 -D $SRC/gtk.immodules $PKG/usr/lib/gtk-3.0/3.0.0/immodules.cache
+	install -m 0755 $SRC/gtk-register-3.sh $PKG/usr/bin/gtk-register-3
+
 	rm -r $PKG/usr/share/{gtk-doc,locale,gtk-3.0}
-	rm $PKG/usr/bin/gtk-update-icon-cache
 }
diff --git a/gtk3/gtk-register-3.sh b/gtk3/gtk-register-3.sh
new file mode 100644
index 000000000..10ca8cbb1
--- /dev/null
+++ b/gtk3/gtk-register-3.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# /usr/bin/gtk-register-3: register input modules
+#
+
+/usr/bin/gtk-query-immodules-3.0 --update-cache
+
+# End of file
diff --git a/gtk3/gtk.immodules b/gtk3/gtk.immodules
new file mode 100644
index 000000000..a22c5b8d9
--- /dev/null
+++ b/gtk3/gtk.immodules
@@ -0,0 +1,40 @@
+# GTK+ Input Method Modules file
+# Automatically generated file, do not edit
+# Created by /usr/bin/gtk-query-immodules-3.0 from gtk+-3.24.24
+#
+# ModulesPath = /usr/lib/gtk-3.0/3.0.0/x86_64-pc-linux-gnu/immodules:/usr/lib/gtk-3.0/3.0.0/immodules:/usr/lib/gtk-3.0/x86_64-pc-linux-gnu/immodules:/usr/lib/gtk-3.0/immodules
+#
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-am-et.so" 
+"am_et" "Amharic (EZ+)" "gtk30" "/usr/share/locale" "am" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-cedilla.so" 
+"cedilla" "Cedilla" "gtk30" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.so" 
+"cyrillic_translit" "Cyrillic (Transliterated)" "gtk30" "/usr/share/locale" "" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-inuktitut.so" 
+"inuktitut" "Inuktitut (Transliterated)" "gtk30" "/usr/share/locale" "iu" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-ipa.so" 
+"ipa" "IPA" "gtk30" "/usr/share/locale" "" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-multipress.so" 
+"multipress" "Multipress" "gtk30" "" "" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-thai.so" 
+"thai" "Thai-Lao" "gtk30" "/usr/share/locale" "lo:th" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-ti-er.so" 
+"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk30" "/usr/share/locale" "ti" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-ti-et.so" 
+"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk30" "/usr/share/locale" "ti" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-viqr.so" 
+"viqr" "Vietnamese (VIQR)" "gtk30" "/usr/share/locale" "" 
+
+"/usr/lib/gtk-3.0/3.0.0/immodules/im-xim.so" 
+"xim" "X Input Method" "gtk30" "/usr/share/locale" "ko:ja:th:zh" 
+
+
diff --git a/gtk3/post-install b/gtk3/post-install
deleted file mode 100755
index 21e60126d..000000000
--- a/gtk3/post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# compile needed glib schemas
-glib-compile-schemas /usr/share/glib-2.0/schemas
-