diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index c430bef24..5888b3a15 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=freeimage
 pkgver=3.18.0
-pkgrel=15
+pkgrel=16
 pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('x86_64')
 license=('GPL' 'custom:FIPL')
@@ -18,10 +18,12 @@ depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'libtiff' 'jxr
 makedepends=('mesa' 'glu')
 source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip"
         freeimage-unbundle.patch
-        freeimage-libraw-0.20.patch)
+        freeimage-libraw-0.20.patch
+        freeimage-libraw-0.21.patch)
 sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
             'bd96331900e3f13c8830ef59377c840fa36b3c3ef97d1effd6f644acfefb7d618812b268f00f8f051e9d4c978b8dac0c0ab0e6ec7db5aaebf0fa0328913cfaac'
-            '5709e4c5baac3505bf2f2498082fbf6b8614e631fec69fc629036c8d033fbe21434a198e9ae24d577dd65928fd31a0d95c584ea4349d74134f7859d4e57b8397')
+            '5709e4c5baac3505bf2f2498082fbf6b8614e631fec69fc629036c8d033fbe21434a198e9ae24d577dd65928fd31a0d95c584ea4349d74134f7859d4e57b8397'
+            'f922af1e000ee83afc87871bbce04076372220174c74a83a6fc3812277f6a0203b631d7f49f250dd78f94015d1a3fb2b72a6b5c4d0a32d4071b197b417d65b8a')
 
 prepare() {
   cd FreeImage
@@ -34,6 +36,7 @@ prepare() {
   > Source/FreeImageToolkit/JPEGTransform.cpp
 
   patch -p1 -i ../freeimage-libraw-0.20.patch # Fix build with libraw 0.20
+  patch -p1 -i ../freeimage-libraw-0.21.patch # Fix build with libraw 0.21
 }
 
 build() {
diff --git a/community/freeimage/freeimage-libraw-0.21.patch b/community/freeimage/freeimage-libraw-0.21.patch
new file mode 100644
index 000000000..dc40057a2
--- /dev/null
+++ b/community/freeimage/freeimage-libraw-0.21.patch
@@ -0,0 +1,12 @@
+diff -ru FreeImage.orig/Source/FreeImage/PluginRAW.cpp FreeImage/Source/FreeImage/PluginRAW.cpp
+--- FreeImage.orig/Source/FreeImage/PluginRAW.cpp	2022-12-18 21:57:11.447801357 +0100
++++ FreeImage/Source/FreeImage/PluginRAW.cpp	2022-12-18 21:58:05.103433138 +0100
+@@ -687,7 +687,7 @@
+ 		// --------------------------------------------
+ 
+ 		// (-s [0..N-1]) Select one raw image from input file
+-		RawProcessor->imgdata.params.shot_select = 0;
++		RawProcessor->imgdata.rawparams.shot_select = 0;
+ 		// (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb)
+ 		RawProcessor->imgdata.params.use_camera_wb = 1;
+ 		// (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras.