diff --git a/conf.d/live.mk b/conf.d/live.mk
index e9142b7b..ecf38d6b 100644
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -1,13 +1,16 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/live: distro/.base use/live/base use/power/acpi/cpufreq
-distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
 distro/dos: distro/.init use/dos use/syslinux/ui-menu
-
+distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
+distro/live: distro/.base use/live/base use/power/acpi/cpufreq
 distro/live-systemd: distro/.base use/live/base use/systemd
-
 distro/live-install: distro/.base use/live/install use/syslinux/localboot.cfg
+distro/live-icewm: distro/live use/live/icewm
+
+distro/live-rescue: distro/live-icewm
+	@$(call add,LIVE_LISTS,$(call tags,extra && (rescue || network)))
+	@$(call add,LIVE_LISTS,$(call tags,rescue && (live || x11)))
 
 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
diff --git a/features.in/rescue/config.mk b/features.in/rescue/config.mk
index 78244a2f..949170df 100644
--- a/features.in/rescue/config.mk
+++ b/features.in/rescue/config.mk
@@ -1,4 +1,4 @@
 use/rescue: use/stage2 sub/stage2/rescue
 	@$(call add_feature)
-	@$(call add,RESCUE_LISTS,$(call tags,base && (rescue || network)))
-	@$(call add,RESCUE_LISTS,$(call tags,extra network))
+	@$(call add,RESCUE_LISTS, \
+		$(call tags,(base || extra) && (rescue || network)))
diff --git a/features.in/rescue/rescue/image-scripts.d/98init-rescue b/features.in/rescue/rescue/image-scripts.d/98init-rescue
index 975ea551..f2e36e80 100755
--- a/features.in/rescue/rescue/image-scripts.d/98init-rescue
+++ b/features.in/rescue/rescue/image-scripts.d/98init-rescue
@@ -4,8 +4,10 @@
 mv -f -- /etc/inittab.rescue /etc/inittab
 
 # enable NFS mounts
-chkconfig rpcbind on
-sed -i 's,#\(RPCBIND_ARGS="-l".*\),\1,' /etc/sysconfig/rpcbind
+if [ -x /etc/rc.d/init.d/rpcbind ]; then
+	chkconfig rpcbind on
+	sed -i 's,#\(RPCBIND_ARGS="-l".*\),\1,' /etc/sysconfig/rpcbind
+fi
 
 # remove unwanted startup scripts
 find /etc/rc.d/rc{2,3,4,5}.d/ -type l -name 'S*' \
diff --git a/pkg.in/lists/tagged/base+rescue b/pkg.in/lists/tagged/base+rescue
index c82fe5bd..b79ec79b 100644
--- a/pkg.in/lists/tagged/base+rescue
+++ b/pkg.in/lists/tagged/base+rescue
@@ -18,109 +18,3 @@ man-pages
 sysfsutils
 sysklogd
 util-linux
-
-# CPU utils
-cpuburn
-x86info
-
-# Disk utils
-bonnie++
-cfdisk
-ddrescue
-disktype
-evms
-evms-ncurses
-gpart
-hdparm
-lvm2
-mdadm
-ms-sys
-parted
-sdparm
-sfdisk
-smartmontools
-testdisk
-mtools
-partimage
-
-# Applications
-binutils
-dmidecode
-hexedit
-pciutils
-procps
-quota
-shadow-suite
-sharutils
-time
-openssl
-
-# Applications/Archiving
-arj
-bzip2
-gzip
-unrar
-unzip
-zip
-
-# Applications/Editors
-vim-console
-
-# Applications/File
-findutils
-file
-less
-mtools
-
-# Filesystem utils
-dosfstools
-e2fsprogs
-jfsprogs
-ntfs-3g
-recover
-recoverdm
-reiserfsprogs
-xfsprogs
-btrfs-progs
-ext3grep
-
-# Applications/Networking
-arpwatch
-elinks
-hostinfo
-iftop
-iproute2
-iptables
-iputils
-lftp
-mailx
-netcat
-netlist
-nfs-utils
-ngrep
-nmap
-openssh-clients
-openssh-server
-p0f
-postfix
-rsync
-scanssh
-#stunnel
-tcpdump
-tcptraceroute
-telnet
-traceroute
-wget
-whois
-
-# Applications/Shells
-zsh
-ash
-bash
-bc
-gpm
-mc
-
-# Development/Debuggers
-strace
-sysstat
diff --git a/pkg.in/lists/tagged/desktop,icewm b/pkg.in/lists/tagged/desktop,icewm
index 8bddfb81..16fdde74 100644
--- a/pkg.in/lists/tagged/desktop,icewm
+++ b/pkg.in/lists/tagged/desktop,icewm
@@ -1 +1,2 @@
 icewm
+xinit
diff --git a/pkg.in/lists/tagged/extra+rescue b/pkg.in/lists/tagged/extra+rescue
new file mode 100644
index 00000000..42f2ea81
--- /dev/null
+++ b/pkg.in/lists/tagged/extra+rescue
@@ -0,0 +1,107 @@
+
+# CPU utils
+cpuburn
+x86info
+
+# Disk utils
+bonnie++
+cfdisk
+ddrescue
+disktype
+evms
+evms-ncurses
+fdisk
+gpart
+hdparm
+lvm2
+mdadm
+ms-sys
+parted
+sdparm
+sfdisk
+smartmontools
+testdisk
+mtools
+partimage
+
+# Applications
+binutils
+dmidecode
+hexedit
+pciutils
+procps
+quota
+shadow-suite
+sharutils
+time
+openssl
+
+# Applications/Archiving
+arj
+bzip2
+gzip
+unrar
+unzip
+zip
+
+# Applications/Editors
+vim-console
+
+# Applications/File
+findutils
+file
+less
+mtools
+
+# Filesystem utils
+dosfstools
+e2fsprogs
+jfsprogs
+ntfs-3g
+recover
+recoverdm
+reiserfsprogs
+xfsprogs
+btrfs-progs
+ext3grep
+
+# Applications/Networking
+arpwatch
+elinks
+hostinfo
+iftop
+iproute2
+iptables
+iputils
+lftp
+mailx
+netcat
+netlist
+nfs-utils
+ngrep
+nmap
+openssh-clients
+openssh-server
+p0f
+postfix
+rsync
+scanssh
+#stunnel
+tcpdump
+tcptraceroute
+telnet
+traceroute
+wget
+whois
+
+# Applications/Shells
+zsh
+ash
+bash
+bc
+gpm
+mc
+
+# Development/Debuggers
+strace
+sysstat
diff --git a/pkg.in/lists/tagged/rescue+live b/pkg.in/lists/tagged/rescue+live
index b3e22122..1a365237 100644
--- a/pkg.in/lists/tagged/rescue+live
+++ b/pkg.in/lists/tagged/rescue+live
@@ -1,5 +1,3 @@
-fdisk
 parted
 mdadm
-rsync
 etcnet-full
diff --git a/pkg.in/lists/tagged/rescue+x11 b/pkg.in/lists/tagged/rescue+x11
new file mode 100644
index 00000000..2539b314
--- /dev/null
+++ b/pkg.in/lists/tagged/rescue+x11
@@ -0,0 +1,3 @@
+fsarchiver
+qt4-fsarchiver
+gparted