diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index 12127137a..4bfa56560 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -304,6 +304,22 @@ SCRIPTS += $(SCRIPTS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(SCRIPTS_IOC_$(OS_CLASS))),)
+SCRIPTS_IOC+=$(subst -nil-,,$(SCRIPTS_IOC_$(OS_CLASS)))
+else
+ifneq (,$(strip $(SCRIPTS_IOC_DEFAULT)))
+SCRIPTS_IOC+=$(SCRIPTS_IOC_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(SCRIPTS_HOST_$(OS_CLASS))),)
+SCRIPTS_HOST+=$(subst -nil-,,$(SCRIPTS_HOST_$(OS_CLASS)))
+else
+ifneq (,$(strip $(SCRIPTS_HOST_DEFAULT)))
+SCRIPTS_HOST+=$(SCRIPTS_HOST_DEFAULT)
+endif
+endif
+
 #
 #	concat specific resource files
 #
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 711fe741d..8e403bbe3 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -52,6 +52,7 @@ ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 LIBRARY += $(LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
+SCRIPTS += $(SCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
 endif
 
@@ -59,6 +60,7 @@ ifeq ($(findstring Ioc,$(VALID_BUILDS)),Ioc)
 LIBRARY += $(LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
+SCRIPTS += $(SCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
 endif