diff --git a/make/conf.mk b/make/conf.mk
index 74df8e86..6d8c62e5 100644
--- a/make/conf.mk
+++ b/make/conf.mk
@@ -4,7 +4,7 @@ include $(MODDIR)/make/rules.mk
 all:
 clean: clean.conf
 install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB install_RSYSLOG \
-	install_APACHE_CONF install_SITE install_SYSTEMD $(CONF_D)
+	install_APACHE_CONF install_SYSTEMD $(CONF_D)
 
 clean.conf:
 	rm -rf *.h *~ .*.swp *.done
diff --git a/make/defs.mk b/make/defs.mk
index 9e959758..cf55ac7e 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -494,15 +494,6 @@ INSTALL_APACHE_CONFDIR  = $(APACHE_CONF_DIR)
 INSTALLED_APACHE_CONF   = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
 endif
 
-# -- SITE
-ifneq ($(TARGET),mingw)
-INSTALLATION_FILE_TYPES += SITE
-SITE            += $(filter-out $(DONT_INSTALL),$(wildcard *.site))
-BUILD_SITEDIR    = $(TOPDIR)/bin/site/modules.d
-INSTALL_SITEDIR  = $(SITE_MODULES_DIR)
-INSTALLED_SITE   = $(addprefix $(INSTALL_SITEDIR)/,$(patsubst %.site,%.conf,$(SITE)))
-endif
-
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += RSYSLOG
@@ -869,6 +860,18 @@ endif
 
 # -- use of supplementary libraries
 
+ifneq ($(filter site,$(PREREQ_BUILD)),)
+SITE_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/site /opt/$(FLAVOUR_PATH_PREFIX)site))
+SITE_VERSION               = $(call version,$(SITE_DIR))
+RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION)
+#RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION)
+PREREQ_BUILD              += ytools
+#INCLUDE                   += -I$(SITE_DIR)/include
+#LIBFLAGS                  += -L$(SITE_DIR)/lib -lsite
+#EXE_SEARCH_PATH           += $(SITE_DIR)/bin
+PREREQ                    += SITE
+endif
+
 ifneq ($(filter jux2,$(PREREQ_BUILD)),)
 JUX2_DIR                   = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(FLAVOUR_PATH_PREFIX)jux2))
 JUX2_VERSION               = $(call version,$(JUX2_DIR))
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 8f369a28..fdb791d9 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -68,7 +68,7 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR
 include $(MODDIR)/make/tag-rules.mk
 include $(MODDIR)/make/upload-rules.mk
 
-BUILD_PACKAGE_SH          = /bin/bash $(MOD_SCRIPT_DIR)/build-package.sh \
+BUILD_PACKAGE_SH          = /bin/bash -x $(MOD_SCRIPT_DIR)/build-package.sh \
 	-N $(RPM_PROJECT) \
 	-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
 	-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR)
diff --git a/make/rules.mk b/make/rules.mk
index 6f38ab17..f2dcd57c 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -312,9 +312,6 @@ $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT
 $(INSTALL_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF
 	$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@
 
-$(INSTALL_SITEDIR)/%.conf: %.site | install_dir_SITE
-	$(INSTALL) -o $(SITEOWNER) -g $(SITEGROUP) -m $(SITEMODE) $< $@
-
 $(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
 	$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@