diff --git a/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg b/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg
index 5a7068f81..136594758 100644
--- a/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg
+++ b/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg
@@ -23,8 +23,8 @@ tw=1019
 th=658
 
 # name of the picture file (full path recommended)
-jpeg=/usr/share/bootsplash/themes/pclinuxos_lightedgrass/images/bootsplash-1024x768.jpg
-silentjpeg=/usr/share/bootsplash/themes/pclinuxos_lightedgrass/images/silent-1024x768.jpg
+jpeg=/etc/bootsplash/themes/ipfire1/images/bootsplash-1024x768.jpg
+silentjpeg=/etc/bootsplash/themes/ipfire1/images/silent-1024x768.jpg
 
 progress_enable=1
 
diff --git a/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg b/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg
index 4a30a3e48..329e29c29 100644
--- a/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg
+++ b/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg
@@ -24,8 +24,8 @@ tw=1024
 th=768
 
 # name of the picture file (full path recommended)
-jpeg=/etc/bootsplash/themes/Linux/images/bootsplash-1024x768.jpg
-silentjpeg=/etc/bootsplash/themes/Linux/images/silent-1024x768.jpg
+jpeg=/etc/bootsplash/themes/ipfire2/images/bootsplash-1024x768.jpg
+silentjpeg=/etc/bootsplash/themes/ipfire2/images/silent-1024x768.jpg
 
 progress_enable=1
 
diff --git a/lfs/bootsplash b/lfs/bootsplash
index 793038bc9..8d2bc926b 100644
--- a/lfs/bootsplash
+++ b/lfs/bootsplash
@@ -78,5 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-mkdir -p /etc/bootsplash/themes/current
 	cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /etc/bootsplash/themes
 	-find /etc/bootsplash/themes -name .svn -exec rm -rf {} \;
+	ln -fs /etc/bootsplash/themes/ipfire1 /etc/bootsplash/themes/current
+	# Set screens for console... Maybe this doesn't work and has to be done at each boot?!
+	for i in `seq 0 5`; do \
+		splash -s -n -u $1 /etc/bootsplash/themes/current/config/bootsplash-1024x768.cfg \
+	done
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)