diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 920ad2d82..c1bf7785b 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -4,6 +4,7 @@ include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 
+###
 SOGO_TOOL = sogo-tool
 $(SOGO_TOOL)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
 $(SOGO_TOOL)_OBJC_FILES += \
@@ -18,7 +19,9 @@ $(SOGO_TOOL)_OBJC_FILES += \
 	SOGoToolRenameUser.m \
 	SOGoToolUserPreferences.m \
 	SOGoToolExpireAutoReply.m
+TOOL_NAME += $(SOGO_TOOL)
 
+###
 SOGO_SLAPD_SOCKD = sogo-slapd-sockd
 $(SOGO_SLAPD_SOCKD)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
 $(SOGO_SLAPD_SOCKD)_OBJC_FILES += \
@@ -27,15 +30,17 @@ $(SOGO_SLAPD_SOCKD)_OBJC_FILES += \
 	SOGoSockD.m \
 	SOGoSockDScanner.m \
 	SOGoSockDOperation.m \
+TOOL_NAME += $(SOGO_SLAPD_SOCKD)
 
+###
 SOGO_EALARMS_NOTIFY = sogo-ealarms-notify
 $(SOGO_EALARMS_NOTIFY)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
 $(SOGO_EALARMS_NOTIFY)_OBJC_FILES += \
 	sogo-ealarms-notify.m \
 	\
 	SOGoEAlarmsNotifier.m
+TOOL_NAME += $(SOGO_EALARMS_NOTIFY)
 
-TOOL_NAME = $(SOGO_TOOL) $(SOGO_SLAPD_SOCKD)  $(SOGO_EALARMS_NOTIFY)
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make