diff --git a/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in b/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in
index eae70e206be9..d4b491f472c8 100644
--- a/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in
+++ b/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in
@@ -1,17 +1,17 @@
 path: "%%PREFIX%%/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders"
 cleanup: {
 	type: lua
 	sandbox: false
 	script: <<EOS
 print("Removing gdk-pixbuf cache directory")
-os.remove("%%PREFIX%%/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders")
+os.remove("%%PREFIX%%/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache")
 EOS
 }
 trigger: {
 	type: lua
 	sandbox: false
 	script: <<EOS
 print("Generating gdk-pixbuf modules cache")
 pkg.exec({"%%PREFIX%%/bin/gdk-pixbuf-query-loaders", "--update-cache"})
 EOS
 }
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index 02446f6ee862..ab6263401d57 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -1,154 +1,156 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
 bin/gdk-pixbuf-thumbnailer
 %%X11%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 %%X11%%include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-macros.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so
 %%JASPER%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so
 %%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so
 %%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so
 %%TIFF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/girepository-1.0/GdkPixbuf-2.0.typelib
 lib/girepository-1.0/GdkPixdata-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
 lib/libgdk_pixbuf-2.0.so.0.4000.0
 %%X11%%lib/libgdk_pixbuf_xlib-2.0.so
 %%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0
 %%X11%%lib/libgdk_pixbuf_xlib-2.0.so.0.4000.0
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 %%X11%%libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 man/man1/gdk-pixbuf-csource.1.gz
 man/man1/gdk-pixbuf-query-loaders.1.gz
 share/gir-1.0/GdkPixbuf-2.0.gir
 share/gir-1.0/GdkPixdata-2.0.gir
 share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/as/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/az/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/be/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/br/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/csb/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/et/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/id/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/io/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/km/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/li/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/my/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/or/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/si/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
 share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
+@dir lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%
+@dir lib/gdk-pixbuf-2.0