diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb097367c5..371860ffa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -414,7 +414,7 @@ gimp-win64-native:
     expire_in: 1 day
     paths:
     - _install-w64
-    - _build-w64/build/windows/installer/lang/
+    - _build-w64/build/windows/installer/
     - _build-w64/meson-*/
   cache:
     paths:
@@ -446,7 +446,7 @@ packaging-win64-native:
     expire_in: 1 day
     paths:
     - gimp-w64
-    - _build-w64/build/windows/installer/lang/
+    - _build-w64/build/windows/installer/
     - done-dll.list
   needs: ["gimp-win64-native"]
 
diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh
index 0840e5d65c..3b365173e7 100644
--- a/build/windows/gitlab-ci/installer-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh
@@ -74,6 +74,9 @@ cd -
 # Copy generated language files into the source directory.
 cp _build-w64/build/windows/installer/lang/*isl build/windows/installer/lang
 
+# Copy generated welcome images into the source directory.
+cp _build-w64/build/windows/installer/*bmp build/windows/installer/
+
 # Construct now the installer.
 VERSION=`grep -rI '\<version *:' meson.build | head -1 | sed "s/^.*version *: *'\([0-9]\+\.[0-9]\+\.[0-9]\+\)' *,.*$/\1/"`
 #MAJOR_VERSION=`echo $VERSION | sed "s/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)$/\1/"`
diff --git a/build/windows/installer/installsplash-devel.bmp b/build/windows/installer/installsplash-devel.bmp
deleted file mode 100755
index 783fa6e9bb..0000000000
Binary files a/build/windows/installer/installsplash-devel.bmp and /dev/null differ
diff --git a/build/windows/installer/installsplash_small-devel.bmp b/build/windows/installer/installsplash_small-devel.bmp
deleted file mode 100755
index a5f1db502f..0000000000
Binary files a/build/windows/installer/installsplash_small-devel.bmp and /dev/null differ
diff --git a/build/windows/installer/meson.build b/build/windows/installer/meson.build
index 55564fb4b4..a9ee6af838 100644
--- a/build/windows/installer/meson.build
+++ b/build/windows/installer/meson.build
@@ -1 +1,13 @@
 subdir('lang')
+
+source_splash=meson.project_source_root() + '/data/images/gimp-splash.png'
+installsplash = custom_target('installsplash-devel.bmp',
+  input : [ 'splash2installer.py' ],
+  depend_files: [ source_splash ],
+  output: [ 'installsplash-devel.bmp', ],
+  command: [ gimpmain_exe, '-nidfs', source_splash,
+             '--batch-interpreter', 'python-fu-eval',
+             '-b', '-', '--quit'],
+  feed: true,
+  build_by_default: true
+)
diff --git a/build/windows/installer/splash2installer.py b/build/windows/installer/splash2installer.py
new file mode 100644
index 0000000000..88b1cf5eff
--- /dev/null
+++ b/build/windows/installer/splash2installer.py
@@ -0,0 +1,38 @@
+image  = Gimp.list_images()[0]
+config = Gimp.get_pdb().lookup_procedure("file-bmp-save").create_config()
+
+def export_scaled_img(image, target_width, target_height, export_path):
+  img        = image.duplicate()
+  w          = img.get_width()
+  h          = img.get_height()
+  new_width  = target_width
+  new_height = target_height
+  offx       = 0
+  offy       = 0
+  if w / target_width * target_height < h:
+    new_width = target_height / h * w
+    offx = (target_width - new_width) / 2
+  else:
+    new_height = target_width / w * h
+    offy = (target_height - new_height) / 2
+  img.scale(new_width, new_height)
+  img.resize(target_width, target_height, offx, offy)
+  # XXX: should we rather use the average color as border?
+  black = Gimp.RGB()
+  black.set(0, 0, 0)
+  Gimp.context_set_background(black)
+  drawables = img.list_selected_drawables()
+  for d in drawables:
+    d.resize_to_image_size()
+
+  config.set_property("image", img)
+  config.set_property("num-drawables", len(drawables))
+  config.set_property("drawables", Gimp.ObjectArray.new(Gimp.Drawable, drawables, False))
+  config.set_property("file", Gio.file_new_for_path(export_path))
+  Gimp.get_pdb().run_procedure_config("file-bmp-save", config)
+
+# These sizes are pretty much hardcoded, and in particular the ratio matters in
+# InnoSetup. Or so am I told. XXX
+export_scaled_img(image, 994, 692, 'build/windows/installer/installsplash-devel.bmp')
+export_scaled_img(image, 497, 360, 'build/windows/installer/installsplash_small-devel.bmp')
+export_scaled_img(image, 1160, 803, 'build/windows/installer/installsplash_big-devel.bmp')
diff --git a/meson.build b/meson.build
index c3a4c1f9db..6d9c7eaced 100644
--- a/meson.build
+++ b/meson.build
@@ -1804,12 +1804,6 @@ meson.add_dist_script('meson_dist_script.sh',
 rootInclude = include_directories('.')
 appInclude  = include_directories('app')
 
-subdir('build/windows')
-if get_option('windows-installer')
-  subdir('po-windows-installer')
-  subdir('build/windows/installer')
-endif
-
 # Tools
 subdir('libgimpbase')
 subdir('tools')
@@ -1852,6 +1846,12 @@ subdir('app-tools')
 subdir('docs')
 subdir('devel-docs')
 
+# Windows installer
+subdir('build/windows')
+if get_option('windows-installer')
+  subdir('po-windows-installer')
+  subdir('build/windows/installer')
+endif
 
 pkgconfig.generate(libgimp,
   filebase: 'gimp-' + gimp_api_version,