diff --git a/make/defs.mk b/make/defs.mk
index 1c1af4a3..863fe95a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -50,7 +50,7 @@ endif
 CVSTOPDIR             ?= $(PROJECTS_DIR)/..
 
 ifeq ($(PROJECT),)
-  PROJECT             := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR))))
+  PROJECT             := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
 endif
 
 GET_OS_SH             ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh
@@ -390,7 +390,7 @@ INSTALL_CFGDIR        ?= $(CONFIG_DIR)
 else
 INSTALL_CFGDIR        ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
 endif
-LOCAL_CFG             ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl))) $(LOCAL_EXTRA_CFG)
+LOCAL_CFG             ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG)
 INSTALLED_CFG         ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG))
 
 # -- SYSCFG