diff --git a/Makefile b/Makefile
index 421f595f..3a9142c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+TOPDIR=.
 MODDIR=.
 
 SUBDIRS = inst/pre \
@@ -18,10 +19,11 @@ SUBDIRS = inst/pre \
 		lib include bin \
 		inst/post
 
-ifneq ($(wildcard $(MODDIR)/make/defs.mk),)
-include $(MODDIR)/make/defs.mk
+ifneq ($(wildcard $(MODDIR)/make/ytools.mk),)
+include $(MODDIR)/make/ytools.mk
 endif
 
+include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/rpmdist.mk
 include $(MODDIR)/make/autoconf.mk
diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 2e988be3..9bb8d1df 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -3,9 +3,10 @@
 # contact@jannet.de
 # $Id$
 
-include $(MODDIR)/make/projdefs.mk
+ifndef LIBNAME
+	LIBNAME := $(PROJECT)
+endif
 
-LIBNAME := $(PROJECT)
 WINVERSION             = $(shell echo $(VERSION) | sed -e "s/\./_/g")
 LOCAL_VERSION          = $(shell echo $(VERSION))
 LOCAL_WINVERSION       = $(shell echo $(VERSION) | sed -e "s/\./_/g")
@@ -13,18 +14,12 @@ 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)
+#DEVELOPMENT            = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
 PROJECT_STEM           = $(PROJECT)-$(DIST_VERSION)
 
 FTP_PCKG_DIR     = /pub/packages
 JANNET_PROJ_DIR  = rsync_ssh://ftp.jannet.de:/usr/local/ftp$(FTP_PCKG_DIR)
 
-ifeq ($(DEVELOPMENT),true)
-	include $(TOPDIR)/make/cfg_dev.mk
-else
-	include $(TOPDIR)/make/cfg_dist.mk
-endif
-
 GCC_VERSION = $(shell  gcc -v 2>&1 | grep version | awk '{ print $$3;}')
 GCC_MAJOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}')
 GCC_MINOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')