diff --git a/mingw-w64-gimp/0007-clang-rc-files-fix.patch b/mingw-w64-gimp/0007-clang-rc-files-fix.patch
new file mode 100644
index 0000000000..b293100d67
--- /dev/null
+++ b/mingw-w64-gimp/0007-clang-rc-files-fix.patch
@@ -0,0 +1,24 @@
+diff -urN gimp-2.10.30-orig/build/windows/gimp-plug-ins.rc.in gimp-2.10.30/build/windows/gimp-plug-ins.rc.in
+--- gimp-2.10.30-orig/build/windows/gimp-plug-ins.rc.in	2021-12-20 04:48:33.000000000 +0800
++++ gimp-2.10.30/build/windows/gimp-plug-ins.rc.in	2022-01-05 20:54:00.814712400 +0800
+@@ -63,5 +63,5 @@
+ END
+ 
+ #include "winuser.h"
+-1	ICON	QUOTE(TOP_SRCDIR) "/build/windows/plug-ins.ico"
+-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest"
++1	ICON	"@top_srcdir@/build/windows/plug-ins.ico"
++CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/build/windows/gimp.manifest"
+diff -urN gimp-2.10.30-orig/build/windows/gimp.rc.in gimp-2.10.30/build/windows/gimp.rc.in
+--- gimp-2.10.30-orig/build/windows/gimp.rc.in	2021-12-20 04:48:33.000000000 +0800
++++ gimp-2.10.30/build/windows/gimp.rc.in	2022-01-05 20:52:37.741960900 +0800
+@@ -64,6 +64,6 @@
+ END
+ 
+ #include "winuser.h"
+-1	ICON	QUOTE(TOP_SRCDIR) "/build/windows/wilber.ico"
+-2	ICON	QUOTE(TOP_SRCDIR) "/build/windows/fileicon.ico"
+-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest"
++1	ICON	"@top_srcdir@/build/windows/wilber.ico"
++2	ICON	"@top_srcdir@/build/windows/fileicon.ico"
++CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/build/windows/gimp.manifest"
diff --git a/mingw-w64-gimp/PKGBUILD b/mingw-w64-gimp/PKGBUILD
index 1ab8fbcf92..26f7654c60 100644
--- a/mingw-w64-gimp/PKGBUILD
+++ b/mingw-w64-gimp/PKGBUILD
@@ -3,13 +3,11 @@
 _realname=gimp
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-_basever=2.10.24
-_prever=
-pkgver=${_basever}${_prever//-/}
-pkgrel=5
+pkgver=2.10.30
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=("${MINGW_PACKAGE_PREFIX}-babl"
@@ -37,52 +35,49 @@ depends=("${MINGW_PACKAGE_PREFIX}-babl"
          "${MINGW_PACKAGE_PREFIX}-poppler"
          "${MINGW_PACKAGE_PREFIX}-python2-pygtk"
          "${MINGW_PACKAGE_PREFIX}-python2-gobject2"
-         "${MINGW_PACKAGE_PREFIX}-xpm-nox"
-        )
+         "${MINGW_PACKAGE_PREFIX}-xpm-nox")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pygobject2-devel"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
-             "intltool"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
+             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "intltool")
 options=('strip' 'makeflags')
-source=(https://download.gimp.org/pub/gimp/v${_basever%.*}/${_realname}-${_basever}${_prever}.tar.bz2
+source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_realname}-${pkgver}.tar.bz2
         0001-find-directx-fix.patch
         0002-python-m4.patch
         0003-mingw-add-ModuleFileName-dir-to-PATH.patch
         0004-replace-pygtk-codegen.patch
         0005-fix-link-python-plugins.patch
-        0006-ucrt-fixes.patch)
-sha256sums=('bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e'
+        0006-ucrt-fixes.patch
+        0007-clang-rc-files-fix.patch)
+sha256sums=('88815daa76ed7d4277eeb353358bafa116cd2fcd2c861d95b95135c1d52b67dc'
             'f7f9badc547f1a0317b95e012530db8df63b7c7038c9d9ff8d0b510c86f43439'
             'ae9b6e8fa40fd471cb58f17454219abf531565b5fbaf616e5fc81b3869bbc4b5'
             '682656d1f7ec70bfd3dd10eba3f8db8abb75c80e44933f8c09c730cea5aeb549'
             '98b6212e669eb3a93877514ee6d3284cb3a44ae6d57b6ecb29de3a076db3dbd2'
             '01651bb582b2120aae67752f6a28c0750ea690d46259d855e28f8b18da567bf5'
-            '8efdbe7a3c36076d0be870c74c2ff9f5d14193b081f216365a6612cc8221c2c8')
+            '8efdbe7a3c36076d0be870c74c2ff9f5d14193b081f216365a6612cc8221c2c8'
+            'f4f8258b352530b0f9dd1ebd4f4730125caa4d047ca17bf9e5180b52be19c117')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${_basever}${_prever}"
+  cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/0001-find-directx-fix.patch
   patch -p1 -i ${srcdir}/0002-python-m4.patch
   patch -p1 -i ${srcdir}/0003-mingw-add-ModuleFileName-dir-to-PATH.patch
   patch -p1 -i ${srcdir}/0004-replace-pygtk-codegen.patch
   patch -p1 -i ${srcdir}/0005-fix-link-python-plugins.patch
   patch -p1 -i ${srcdir}/0006-ucrt-fixes.patch
+  patch -p1 -i ${srcdir}/0007-clang-rc-files-fix.patch
 
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I m4macros
-  automake -a -c
-  autoheader
-  autoconf
+  sed -e "s|-Wl,-rpath '-Wl,\$\$ORIGIN/../lib'||g" -i app/Makefile.am
 
-  #autoreconf -fi -I m4macros
+  autoreconf -fiv
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  cp -rf ${_realname}-${_basever}${_prever} build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  cp -rf ${_realname}-${pkgver} build-${MSYSTEM}
+  cd build-${MSYSTEM}
 
   PYTHON=${MINGW_PREFIX}/bin/python2 \
   ./configure \
@@ -106,7 +101,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd build-${MSYSTEM}
   make DESTDIR="${pkgdir}" install
 
   ln -s gimptool-2.0 "${pkgdir}${MINGW_PREFIX}/bin/gimptool.exe"
@@ -114,5 +109,5 @@ package() {
   rm -f "${pkgdir}${MINGW_PREFIX}/lib/*.def"
   rm -f "${pkgdir}${MINGW_PREFIX}/lib/gimp/2.0/modules/*.dll.a"
 
-  cp ${pkgdir}${MINGW_PREFIX}/bin/gimp-${pkgver%.*}.exe ${pkgdir}${MINGW_PREFIX}/bin/gimp.exe
+  cp -p ${pkgdir}${MINGW_PREFIX}/bin/gimp-${pkgver%.*}.exe ${pkgdir}${MINGW_PREFIX}/bin/gimp.exe
 }