diff --git a/bootsplash-startup.service b/bootsplash-startup.service
new file mode 100644
index 00000000..8ed061fe
--- /dev/null
+++ b/bootsplash-startup.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Start bootsplash
+DefaultDependencies=no
+ConditionKernelCommandLine=splash=silent
+
+[Service]
+ExecStart=/lib/system/systemd-bootsplash B
+Type=oneshot
+RemainAfterExit=true
diff --git a/systemd-bootsplash b/systemd-bootsplash
new file mode 100644
index 00000000..653cbe7d
--- /dev/null
+++ b/systemd-bootsplash
@@ -0,0 +1,3 @@
+#! /bin/bash
+. /etc/rc.splash $1
+splashtrigger "rlchange $1"
diff --git a/systemd-gtk.changes b/systemd-gtk.changes
index 0a375c0a..0a3b1e3f 100644
--- a/systemd-gtk.changes
+++ b/systemd-gtk.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 23 15:39:03 UTC 2011 - fcrozat@suse.com
+
+- Add systemd-splash / bootsplash-startup.service: enable
+  bootsplash at startup.
+
 -------------------------------------------------------------------
 Fri Sep 16 15:54:54 UTC 2011 - fcrozat@suse.com
 
diff --git a/systemd.changes b/systemd.changes
index 0a375c0a..0a3b1e3f 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 23 15:39:03 UTC 2011 - fcrozat@suse.com
+
+- Add systemd-splash / bootsplash-startup.service: enable
+  bootsplash at startup.
+
 -------------------------------------------------------------------
 Fri Sep 16 15:54:54 UTC 2011 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 7d036375..1e9dca3e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -53,6 +53,8 @@ Source3:        systemd-sysv-convert
 Source4:        macros.systemd
 Source5:        systemd-insserv_conf
 Source6:        baselibs.conf
+Source7:        systemd-bootsplash
+Source8:        bootsplash-startup.service
 Patch1:         0001-Add-bootsplash-handling-for-password-dialogs.patch
 # handle SUSE specific kbd settings
 Patch6:         0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch
@@ -142,6 +144,8 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated}
 install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
 install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators
+install -m755 %{S:7} %{buildroot}/lib/systemd/
+install -m644 %{S:8} %{buildroot}/lib/systemd/system/
 ln -s ../bin/systemd %{buildroot}/sbin/init
 ln -s ../bin/systemctl %{buildroot}/sbin/reboot
 ln -s ../bin/systemctl %{buildroot}/sbin/halt