diff --git a/make/defs-dirs.mk b/make/defs-dirs.mk
index f389a6ab..95d67823 100644
--- a/make/defs-dirs.mk
+++ b/make/defs-dirs.mk
@@ -8,22 +8,3 @@ SUBDIRS                ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(F
 #SUBDIRS                ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
 #SUBDIRS                ?= $(FIND_SUBDIRS)
 
-ifneq ($(DONT_CHECK_PREREQ_DONE),true)
-  ifndef PREREQ
-    PREREQ           := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
-  endif
-  ifndef PREREQ_DIRS
-    PREREQ_DIRS      := $(call proj_query,proj-dir $(PREREQ))
-  endif
-  PREREQ_DIRS_DONE   := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
-endif
-
-ifneq ($(SUBDIRS_TO_ITERATE),)
-
-  ifeq ($(MAKECMDGOALS),)
-    SUBDIR_TARGETS      = all
-  else
-    SUBDIR_TARGETS      = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
-  endif
-  
-endif
diff --git a/make/defs.mk b/make/defs.mk
index 2b4c32d7..9e7bd13a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -582,7 +582,7 @@ BTOOLS_DIR             ?= $(call proj_dir, dspider-btools)
 #DSPCD_DIR              ?= $(call proj_dir, dspcd)
 #DSPCD_EC_DIR           ?= $(call proj_dir, dspcd-ec)
 FEEDFSD_DIR            ?= $(call proj_dir, feedfsd)
-FEEDFS_DIR             ?= $(call proj_dir, feedfs)
+FEEDFS_DIR             := $(call proj_dir, feedfs)
 FEEDFS_GUI_DIR         ?= $(call proj_dir, feedfs-gui)
 FEEDFS_OBJECTS_DIR     ?= $(call proj_dir, feedfs-objects)
 FEEDFS_UTILS_DIR       ?= $(call proj_dir, feedfs-utils)
diff --git a/make/make.mk b/make/make.mk
index 3d3f8c60..b8a6df81 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -6,7 +6,7 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/defs-dirs.mk
 
-CACHED_FILES      ?= $(VERSION_FILE)
+CACHED_FILES      ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
 CACHED_VARS       ?= PROJECT PREREQ VERSION HEX_VERSION
 
 include $(MODDIR)/make/cache.mk
diff --git a/make/subdirs.mk b/make/subdirs.mk
index ef9e1338..78ed3123 100644
--- a/make/subdirs.mk
+++ b/make/subdirs.mk
@@ -1,3 +1,5 @@
+include $(MODDIR)/make/defs-dirs.mk
+
 all:
 clean: clean.var
 distclean: clean.var distclean.var
diff --git a/make/topdir.mk b/make/topdir.mk
index a20ebb43..d0b14e05 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -34,6 +34,27 @@ REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
 REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR)
 
 include $(MODDIR)/make/dirs.mk
+
+ifneq ($(DONT_CHECK_PREREQ_DONE),true)
+  ifndef PREREQ
+    PREREQ           := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
+  endif
+  ifndef PREREQ_DIRS
+    PREREQ_DIRS      := $(call proj_query,proj-dir $(PREREQ))
+  endif
+  PREREQ_DIRS_DONE   := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
+endif
+
+ifneq ($(SUBDIRS_TO_ITERATE),)
+
+  ifeq ($(MAKECMDGOALS),)
+    SUBDIR_TARGETS      = all
+  else
+    SUBDIR_TARGETS      = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
+  endif
+  
+endif
+
 include $(MODDIR)/make/rpmdist.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/doc-rules.mk