diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 42095503..a2971a67 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -23,6 +23,16 @@
 
 -include local.mk
 
+# -- Find JWBDIR
+DEV_PROJECTS_DIR            ?= .
+JWBDIR_NAME                 ?= jw-build
+JWBDIR_SEARCH_PATH          ?= $(DEV_PROJECTS_DIR) $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)
+JWBDIR                      ?= $(firstword $(wildcard $(addsuffix /$(JWBDIR_NAME),$(JWBDIR_SEARCH_PATH))))
+
+JW_BUILD_BINDIR              = $(JWBDIR)/bin
+JWB_SCRIPT_DIR               = $(firstword $(wildcard ./$(JWBDIR_NAME)/scripts $(JW_BUILD_BINDIR)) jwb-script-dir-not-found)
+JW_BUILD_REMOTE_BINDIR       = /opt/jw-build/bin
+
 SHELL                        = /bin/bash -o pipefail +H
 PROJECTS_TXT                ?= projects.txt
 JW_BUILD_VERBOSE            ?= false
@@ -46,8 +56,7 @@ export JW_BUILD_VERBOSE
 # ------------ external programs I
 
 CWD                         := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-JWB_SCRIPT_DIR               = $(firstword $(wildcard ./jw-build/scripts /opt/jw-build/bin) jwb-script-dir-not-found)
-GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found)
+GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh $(JW_BUILD_BINDIR)/get-os.sh) get-os-sh-not-found)
 SSH_WRAPPER_SH              := $(CWD)/ssh-wrapper.sh
 
 EXCLUDES_FILE               ?= exclude.txt
@@ -124,13 +133,13 @@ endif
 PROJECTS_PY                  = python3 $(JWB_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS)
 PROJECTS_PY_BUILD            = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS)
 PGIT_SH                      = /bin/bash $(JWB_SCRIPT_DIR)/pgit.sh
-PURGE_SH                     = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
-PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
-CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
-LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
-JW_PKG                       = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
-GIT_SRV_ADMIN_SH             = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
-CVS_ADMIN_SH                 = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh
+PURGE_SH                     = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_BUILD_BINDIR)/purge-stale-projects.sh) purge-not-found)
+PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh $(JW_BUILD_BINDIR)/pkg-manager.sh) pkg-manager-not-found)
+CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-build-create-project.sh $(JW_BUILD_BINDIR)/jw-build-create-project.sh) jw-build-create-project-not-found)
+LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_BUILD_BINDIR)/scm.sh) scm-sh-not-found) ls-files
+JW_PKG                       = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg $(JW_BUILD_BINDIR)/jw-pkg) jw-pkg-not-found)
+GIT_SRV_ADMIN_SH             = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com $(JW_BUILD_REMOTE_BINDIR)/git-srv-admin.sh
+CVS_ADMIN_SH                 = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com $(JW_BUILD_REMOTE_BINDIR)/cvs-admin.sh
 
 # ------------ projects to be built