diff --git a/conf.d/regular.mk b/conf.d/regular.mk
index 44e15271..09da3c81 100644
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -29,6 +29,13 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
 	@$(call add,LIVE_PACKAGES,deepsolver deepsolver-repo)
 	@$(call set,KFLAVOURS,un-def)
 
+distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
+	use/x11/wmaker
+	@$(call add,LIVE_PACKAGES,xxkb)
+
+distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep
+	@$(call add,THE_BRANDING,graphics)
+
 distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
 
 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality
diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk
index d27cd490..1d1a444d 100644
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -79,3 +79,9 @@ use/x11/fvwm: use/x11/xorg
 
 use/x11/sugar: use/x11/xorg
 	@$(call add,THE_LISTS,$(call tags,sugar desktop))
+
+use/x11/wmaker: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,wmaker desktop))
+
+use/x11/gnustep: use/x11/xorg
+	@$(call add,THE_LISTS,$(call tags,gnustep desktop))
diff --git a/pkg.in/lists/tagged/desktop+gnustep b/pkg.in/lists/tagged/desktop+gnustep
new file mode 100644
index 00000000..1c52baf0
--- /dev/null
+++ b/pkg.in/lists/tagged/desktop+gnustep
@@ -0,0 +1,68 @@
+
+gnustep-back
+gnustep-base
+gnustep-charsets
+gnustep-dbuskit
+gnustep-dirs
+gnustep-easydiff
+gnustep-gmastermind
+gnustep-gmines
+gnustep-gorm
+gnustep-gshisen
+gnustep-gui
+gnustep-gworkspace
+gnustep-make
+gnustep-mknfonts
+gnustep-pdfkit
+gnustep-projectcenter
+gnustep-renaissance
+gnustep-simplewebkit
+gnustep-sqlclient
+gnustep-steptalk
+gnustep-sudoku
+gnustep-systempreferences
+gnustep-themes-Gtk
+gnustep-ucsdata
+gnustep-xcode
+libgnustep-objc2
+
+gnustep-AddressManager
+gnustep-CDPlayer
+gnustep-FTP
+gnustep-FisicaLab
+gnustep-GNUMail
+gnustep-GSPdf
+gnustep-Gemas
+gnustep-Graphos
+gnustep-HighlighterKit
+gnustep-IMImage
+gnustep-LaternaMagica
+gnustep-NoteBook
+gnustep-PRICE
+gnustep-Pantomime
+gnustep-RpmViewer
+gnustep-SimpleAgenda
+gnustep-TextEdit
+gnustep-Zipper
+gnustep-themes-Neos
+gnustep-themes-Nesedah
+gnustep-themes-Narcissus
+gnustep-silver.theme
+gnustep-cddb.bundle
+
+gnustep-Ghack
+gnustep-RSSkit
+gnustep-Grr
+#gnustep-IconManager
+gnustep-LapisPuzzle
+gnustep-MPDCon
+gnustep-TimeMon
+##gnustep-PictureFrame	is not even alpha quality yet
+
+gnustep-SGContentViewer
+gnustep-Preview
+
+gnustep-terminal
+
+# a text editor
+leafpad
diff --git a/pkg.in/lists/tagged/desktop+wmaker b/pkg.in/lists/tagged/desktop+wmaker
new file mode 100644
index 00000000..2a466a96
--- /dev/null
+++ b/pkg.in/lists/tagged/desktop+wmaker
@@ -0,0 +1,10 @@
+WindowMaker
+
+wmsystemtray
+wmdf
+wmnd
+wmsm
+wmacpi
+wmfire
+wmclock
+wmaker-theme-club07