diff --git a/build/windows/installer/base_gimp3264.iss b/build/windows/installer/base_gimp3264.iss
index aa22d91b07..db6cdded8c 100644
--- a/build/windows/installer/base_gimp3264.iss
+++ b/build/windows/installer/base_gimp3264.iss
@@ -390,6 +390,10 @@ Source: "{code:GetExternalConfDir}\{#FileName}"; DestDir: "{app}\32\{#ConfigDir}
 
 #endif //NOFILES
 
+;We need at least an empty folder to avoid GIMP*_LOCALEDIR warnings
+[Dirs]
+Name: "{app}\32\share\locale"; Components: gimp32on64; Flags: uninsalwaysuninstall
+
 
 [InstallDelete]
 Type: files; Name: "{app}\bin\gimp-?.?.exe"
diff --git a/build/windows/installer/base_twain32on64.list b/build/windows/installer/base_twain32on64.list
index b3f482b29d..caf90822d3 100644
--- a/build/windows/installer/base_twain32on64.list
+++ b/build/windows/installer/base_twain32on64.list
@@ -1,12 +1,53 @@
 #list of 32bit files to install on x64
 !GTK
-etc\fonts\
 lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll
 lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
 lib\babl-0.1\*.dll
-lib\gegl-0.4\*.dll
-share\locale\
-bin\*.dll
+lib\gegl-0.4\gegl*.dll
+bin\libbabl-0.1-0.dll
+bin\libbrotlicommon.dll
+bin\libbrotlidec.dll
+bin\libbz2-1.dll
+bin\libcairo-2.dll
+bin\libcrypto-3.dll
+bin\libcurl-4.dll
+bin\libdatrie-1.dll
+bin\libexiv2-27.dll
+bin\libexpat-1.dll
+bin\libffi-8.dll
+bin\libfontconfig-1.dll
+bin\libfreetype-6.dll
+bin\libfribidi-0.dll
+bin\libgcc_s_dw2-1.dll
+bin\libgdk_pixbuf-2.0-0.dll
+bin\libgegl-0.4-0.dll
+bin\libgexiv2-2.dll
+bin\libgio-2.0-0.dll
+bin\libglib-2.0-0.dll
+bin\libgmodule-2.0-0.dll
+bin\libgobject-2.0-0.dll
+bin\libgomp-1.dll
+bin\libgraphite2.dll
+bin\libharfbuzz-0.dll
+bin\libiconv-2.dll
+bin\libidn2-0.dll
+bin\libintl-8.dll
+bin\libjson-glib-1.0-0.dll
+bin\liblcms2-2.dll
+bin\libnghttp2-14.dll
+bin\libpango-1.0-0.dll
+bin\libpcre2-8-0.dll
+bin\libpixman-1-0.dll
+bin\libpng16-16.dll
+bin\libpsl-5.dll
+bin\libssh2-1.dll
+bin\libssl-3.dll
+bin\libstdc++-6.dll
+bin\libthai-0.dll
+bin\libunistring-5.dll
+bin\libwinpthread-1.dll
+bin\libzstd.dll
+bin\zlib1.dll
 !GIMP
-bin\*.dll
+bin\libgimp*.dll
 !end