diff --git a/features.in/net/config.mk b/features.in/net/config.mk
index bb28e6df8581c374e4b7ff238ba4bf3d3d9efdde..86b0b97baa2beeacaa779b8e275d7d391e026a81 100644
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -19,7 +19,7 @@ use/net/dhcp: use/net
 # base service, no GUI; see x11 feature for those
 use/net/nm: use/net
 	@$(call set,THE_NET_SUBSYS,NetworkManager)
-	@$(call add,THE_LISTS,$(call tags,base nm))  # NB: won't get overridden
+	@$(call add,THE_LISTS,network/NetworkManager)  # NB: won't get overridden
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,network) # need for NM?
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk
index 6afdfe8c57a8f0186e3117842e3987113f00d62f..49654d488719fd77f2d24c6a371d414a86b033cb 100644
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -143,7 +143,7 @@ use/x11/kde/synaptic:
 	@$(call add,THE_PACKAGES,synaptic-kde synaptic-usermode-)
 
 use/x11/gtk/nm: use/net/nm
-	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_LISTS,network/NetworkManager-gtk)
 
 use/x11/xfce: use/x11
 	@$(call add,THE_PACKAGES,xfce4-minimal xfce4-default)
diff --git a/pkg.in/lists/tagged/base+nm b/pkg.in/lists/network/NetworkManager
similarity index 100%
rename from pkg.in/lists/tagged/base+nm
rename to pkg.in/lists/network/NetworkManager
diff --git a/pkg.in/lists/tagged/desktop+nm b/pkg.in/lists/network/NetworkManager-gtk
similarity index 100%
rename from pkg.in/lists/tagged/desktop+nm
rename to pkg.in/lists/network/NetworkManager-gtk