diff --git a/make/defs.mk b/make/defs.mk
index 9087b17d..ed950591 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -13,6 +13,7 @@ HEX_VERSION            = $(shell echo $(DIST_VERSION) | \
 	sed 's/-dev//; s/pre[^\.]*//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
 DEVELOPMENT           ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
 USE_PROJECT_LIB       ?= true
+USE_YTOOLS            ?= true
 REENTRANT             ?= true
 export REENTRANT
 
@@ -39,7 +40,6 @@ DIST_VERSION           = $(shell echo $(VERSION) | sed -e "s/-dev//")
 DIST_WINVERSION        = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
 LOCAL_DIST_VERSION     = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
 LOCAL_DIST_WINVERSION  = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
-#DEVELOPMENT           = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
 PROJECT_STEM           = $(PROJECT)-$(DIST_VERSION)
 CVS_ROOT_DIR           = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%")
 REV_SUBDIRS            = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
@@ -284,10 +284,15 @@ endif
 # ----- standard features, switched on with USE_XXX = true
 
 ifeq ($(USE_PROJECT_LIB),true)
-	PROJECTLIB_LDFLAGS    += -l$(LIBNAME) -L$(MODDIR)/lib
+	PROJECTLIB_LDFLAGS    += -l$(LIBNAME) -L$(TOPDIR)/lib
 	LD_LIB_PATH           += $(TOPDIR)/lib
 endif
 
+ifeq ($(USE_YTOOLS),true)
+	PROJECTLIB_LDFLAGS    += -lytools -L$(MODDIR)/lib
+	LD_LIB_PATH           += $(MODDIR)/lib
+endif
+
 ifeq ($(USE_TIMER),true)
 	CFLAGS      += -D_USE_TIMER_
 	CPPFLAGS    += -D_USE_TIMER_