diff --git a/distro.mk b/distro.mk
index 23406dad..d4a620ef 100644
--- a/distro.mk
+++ b/distro.mk
@@ -65,9 +65,9 @@ distro/server-ovz: distro/server-base use/hdt use/rescue use/firmware/server
 	@$(call add,BASE_LISTS,ovz-server)
 	@$(call add,BASE_LISTS,$(call tags,base server))
 	@$(call add,MAIN_LISTS,kernel-wifi)
-	@$(call add,GROUPS,dns-server http-server ftp-server kvm-server)
-	@$(call add,GROUPS,ipmi mysql-server dhcp-server mail-server)
-	@$(call add,GROUPS,monitoring diag-tools)
+	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
+	@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
+	@$(call add,MAIN_GROUPS,monitoring diag-tools)
 
 # desktop distributions
 
diff --git a/features.in/live/live/stage2cfg.mk b/features.in/live/live/stage2cfg.mk
index ed8964a2..308e75b7 100644
--- a/features.in/live/live/stage2cfg.mk
+++ b/features.in/live/live/stage2cfg.mk
@@ -2,7 +2,7 @@
 
 IMAGE_PACKAGES = $(COMMON_PACKAGES) \
 		 $(LIVE_PACKAGES) \
-		 $(call map,list,$(LIVE_LISTS) $(LIVE_GROUPS)) \
+		 $(call map,list,$(LIVE_LISTS) $(LIVE_MAIN_GROUPS)) \
 		 interactivesystem
 
 MKI_PACK_RESULTS = squash:live
diff --git a/image.in/Makefile b/image.in/Makefile
index a19e9ffa..e9d5dc45 100644
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -49,8 +49,8 @@ metadata: dot-base
 	@rm -f files/Metadata/pkg-groups.tar
 # see also alterator-pkg (backend3/pkg-install); we only tar up what's up to it
 	@tar -cvf files/Metadata/pkg-groups.tar -C $(PKGDIR) \
-		$$(echo $(call list,$(GROUPS) .base) \
-			$(call group,$(GROUPS)) \
+		$$(echo $(call list,$(MAIN_GROUPS) .base) \
+			$(call group,$(MAIN_GROUPS)) \
 		   | sed 's,$(PKGDIR)/*,,g')
 
 dot-base:
diff --git a/pkg.in/groups/Makefile b/pkg.in/groups/Makefile
index dfada64f..2d44727f 100644
--- a/pkg.in/groups/Makefile
+++ b/pkg.in/groups/Makefile
@@ -10,9 +10,9 @@ SUFFIX := pkg/groups
 TARGET := $(BUILDDIR)/$(SUFFIX)
 
 all: $(GLOBAL_DEBUG)
-	@if [ -n "$(GROUPS)" ]; then \
+	@if [ -n "$(MAIN_GROUPS)" ]; then \
 		mkdir -p $(TARGET) && \
-		cp -at $(TARGET) -- $(addsuffix .directory,$(GROUPS)); \
+		cp -at $(TARGET) -- $(addsuffix .directory,$(MAIN_GROUPS)); \
 		type -t git >&/dev/null && \
 		cd $(TARGET) && \
 		git add . && \
@@ -21,4 +21,4 @@ all: $(GLOBAL_DEBUG)
 	fi
 
 debug:
-	@echo "** GROUPS: $(GROUPS)"
+	@echo "** MAIN_GROUPS: $(MAIN_GROUPS)"
diff --git a/pkg.in/groups/README b/pkg.in/groups/README
index 58c5d2d1..22ae05c7 100644
--- a/pkg.in/groups/README
+++ b/pkg.in/groups/README
@@ -1,6 +1,6 @@
 Этот каталог содержит описания групп, копируемые из метапрофиля
 в создаваемый профиль по необходимости (только фигурирующие в
-списке, которым является значение переменной GROUPS).
+списке, которым является значение переменной MAIN_GROUPS).
 
 В данный момент перенесено почти 1:1 из mkimage-profiles-desktop,
 требует увязки с ../lists/tagged/.
diff --git a/pkg.in/lists/Makefile b/pkg.in/lists/Makefile
index bdb7c01e..ce41a243 100644
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -35,7 +35,7 @@ all: $(TARGET) $(GLOBAL_DEBUG)
 			echo "$(BASE_PACKAGES)"; \
 		}; \
 	) | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
-	@[ -z "$(GROUPS)" ] || cp -at $(TARGET) $(GROUPS)
+	@[ -z "$(MAIN_GROUPS)" ] || cp -at $(TARGET) $(MAIN_GROUPS)
 	@type -t git >&/dev/null && \
 	cd $(TARGET) && \
 	git add . && \
diff --git a/sub.in/main/Makefile b/sub.in/main/Makefile
index 35f5b04b..18a2bad1 100644
--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -15,7 +15,7 @@ CHROOT_PACKAGES = apt-utils rsync
 IMAGE_PACKAGES_REGEXP = $(call kpackages,$(KMODULES),$(KFLAVOURS)) \
 			$(MAIN_PACKAGES_REGEXP)
 
-IMAGE_PACKAGES = $(call map,list,$(BASE_LISTS) $(MAIN_LISTS) $(GROUPS)) \
+IMAGE_PACKAGES = $(call map,list,$(BASE_LISTS) $(MAIN_LISTS) $(MAIN_GROUPS)) \
 		 $(COMMON_PACKAGES) \
 		 $(BASE_PACKAGES) \
 		 $(MAIN_PACKAGES)