diff -rN -u old-boobaa/fwlive-minimal/Makefile new-boobaa/fwlive-minimal/Makefile
--- old-boobaa/fwlive-minimal/Makefile	2006-10-17 21:15:49.000000000 +0200
+++ new-boobaa/fwlive-minimal/Makefile	2006-10-17 21:15:50.000000000 +0200
@@ -41,8 +41,6 @@
 FWREL = 0.5 (Siwenna)
 # please do double-check if this tells kernel-fwlive's version (or FIXME: sed it from kernel-fwlive's version)
 KERNELVER = 2.6.18-fw1
-# later update this to "latest linux-live" by an up2date or so (XXX: patch needs to be updated every time?)
-LINUXLIVEVER = 5.5.0
 # whole groups of pkgs to be installed (after base)
 INST_GROUPS = 
 # additional  packages to be installed
@@ -51,12 +49,11 @@
 ##	firefox firefox-${FWLSLANG} thunderbird thunderbird-${FWLSLANG} openoffice.org openoffice.org-i18n-${FWLSLANG} \
 ##	openoffice.org-dict-${FWLSLANG} huhyphn-${FWLSLANG} nmap gqview gwenview xsane wget irssi
 ## for testing, we use only the following ones (to be faster a bit) (dbus & hal for the sake of patches ;) )
-INST_APPS = cdrtools openssh mc wget lynx nmap irssi dbus hal
+INST_APPS = cdrtools openssh mc wget lynx nmap irssi dbus hal linux-live
 # needed files (files that we can't live without)
 NEED_FILES = rc_scripts-no_remount_ro.diff sysctl-added_cdrom_locking.diff \
 	rc.4-desktop_start_fix.diff hosts rc_scripts-silent.diff desktop.wm \
 	rc_scripts-open_cdrom_at_shutdown.diff eth0_dhcp.diff crypt.c \
-	linux-live-${LINUXLIVEVER}-fwlive_version.diff linux-live-${LINUXLIVEVER}.tar.gz \
 	parse_cmdline create_fstab x_start_wm \
 	parse_cmdline.en parse_cmdline.hu \
 	rc.parse_cmdline rc_scripts-added_fstab_creator.diff rc.fwlive
@@ -75,13 +72,10 @@
 	   /etc/frugalware-release
 CC = cc
 
-all:	checkroot linux-live-download checkfiles chroot-mkdirs create-pkgdb cache-mount install-base install-groups install-apps install-kernel cache-umount install-files patch-files remove-files kill-splashy create-symlinks create-files fix-files create-users linux-live chroot-mount create-iso chroot-umount
+all:	checkroot checkfiles chroot-mkdirs create-pkgdb cache-mount install-base install-groups install-apps install-kernel cache-umount install-files patch-files remove-files kill-splashy create-symlinks create-files fix-files create-users linux-live chroot-mount create-iso chroot-umount
 	@echo "Finally, we do nothing more by now."
 	@echo "Now burn your iso and have fun!"
 
-linux-live-download:
-	wget -c http://www.linux-live.org/dl/linux-live-${LINUXLIVEVER}.tar.gz 2>>/dev/null
-
 checkfiles:
 	for i in ${NEED_FILES}; do \
 		if [ ! -f $$i ] ; then \
@@ -177,24 +171,20 @@
 	echo "fwlive    ALL=(ALL) NOPASSWD:ALL" >${CHROOTDIR}/etc/sudoers
 
 linux-live: checkroot
-	tar -xzf linux-live-${LINUXLIVEVER}.tar.gz -C ${CHROOTDIR}/tmp
-	cp linux-live-${LINUXLIVEVER}-fwlive_version.diff ${CHROOTDIR}/tmp
-	cd ${CHROOTDIR}/tmp; \
-	patch -p0 -i linux-live-${LINUXLIVEVER}-fwlive_version.diff
-	sed -i "s|SLAX|FwLive ${FWLREL}|" ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/cd-root/make_iso.sh
-	sed -i "s|slax|fwlive-${FWLREL}|" ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/cd-root/make_iso.sh
-	mkdir -p ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/initrd/kernel-modules/${KERNELVER}
+	cp -a ${CHROOTDIR}/usr/share/linux-live /tmp/
+	sed -i "s|SLAX|FwLive ${FWLREL}|" ${CHROOTDIR}/tmp/linux-live/cd-root/make_iso.sh
+	sed -i "s|slax|fwlive-${FWLREL}|" ${CHROOTDIR}/tmp/linux-live/cd-root/make_iso.sh
+	mkdir -p ${CHROOTDIR}/tmp/linux-live/initrd/kernel-modules/${KERNELVER}
 	for i in $$(find ${CHROOTDIR}/lib/modules/${KERNELVER} -name "*.ko") ; do \
-		cp $${i} ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/initrd/kernel-modules/${KERNELVER}/; \
+		cp $${i} ${CHROOTDIR}/tmp/linux-live/initrd/kernel-modules/${KERNELVER}/; \
 	done
-	rm -rf ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/initrd/kernel-modules/2.6.16
-	sed -i "s|KERNEL=.*|KERNEL=\"${KERNELVER}\"|" ${CHROOTDIR}/tmp/linux-live-${LINUXLIVEVER}/config
+	sed -i "s|KERNEL=.*|KERNEL=\"${KERNELVER}\"|" ${CHROOTDIR}/tmp/linux-live/config
 
 create: chroot-mount create-iso chroot-umount
 	echo "./fwlive-${FWLSREL}.iso created."
 
 create-iso: checkroot
-	echo "" | chroot ${CHROOTDIR} /tmp/linux-live-${LINUXLIVEVER}/runme.sh
+	echo "" | chroot ${CHROOTDIR} /tmp/linux-live/runme.sh
 	mv ${CHROOTDIR}/tmp/livecd.iso ./fwlive-${FWLSREL}.iso
 	echo "Won't calculate any sums. Period."
 
@@ -219,5 +209,4 @@
 
 #really-clean: clean checkroot
 really-clean: clean checkroot
-	rm -f linux-live-${LINUXLIVEVER}.tar.gz
 	rm -rf ${CHROOTDIR}/*