diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk
index 1eb4242..d01272b 100644
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -8,3 +8,7 @@ use/x11/runlevel5: use/x11/xorg
 ### xdm: see also #23108
 use/x11/xdm: use/x11/runlevel5
 	@$(call add,BASE_PACKAGES,xdm installer-feature-no-xconsole)
+
+### wdm
+use/x11/wdm: 
+	@$(call add,BASE_PACKAGES,wdm installer-feature-no-xconsole)
diff --git a/lib/distro.mk b/lib/distro.mk
index 8aedc6a..ed0f2b1 100644
--- a/lib/distro.mk
+++ b/lib/distro.mk
@@ -85,13 +85,25 @@ distro/server-ovz: distro/server-base \
 # desktop distributions
 
 distro/desktop-base: distro/installer sub/main \
-	use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
+	use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub \
+	use/powerbutton/acpi use/x11/runlevel5
+	@$(call add,BASE_LISTS,$(call tags,base network))
+	@$(call add,BASE_LISTS,$(call tags,base l10n))
+	@$(call add,BASE_LISTS,$(call tags,system desktop))
 
 distro/icewm: distro/desktop-base \
-	use/lowmem use/x11/xdm use/x11/runlevel5 \
-	use/bootloader/lilo use/powerbutton/acpi \
-	use/cleanup/alterator
+	use/x11/xdm
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))
 
+distro/e17: distro/desktop-base \
+	use/x11/wdm
+	@$(call add,BASE_LISTS,$(call tags,e17 desktop))
+
+distro/small: distro/icewm \
+	use/x11/wdm
+	@$(call add,BASE_LISTS,$(call tags,small desktop))
+	@$(call add,BASE_LISTS,$(call tags,www desktop))
+	@$(call add,BASE_LISTS,$(call tags,alterator desktop))
+
 # NB: if there are too many screens above, it might make sense to distro.d/
 endif