diff --git a/make/autoconf.mk b/make/autoconf.mk
index d573c55e..3666b1cb 100644
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -5,9 +5,14 @@
 
 CLEAN += $(wildcard *.acdone)
 DISTCLEAN += configure config.log autoscan.log configure.ac config.status
-AC_FILES_IN = $(shell find . -name '*.in')
+AC_FILES_IN = $(shell find . -name '*.in' | grep -v contrib)
 AC_FILES    = $(basename $(AC_FILES_IN))
 
+all: config $(AC_FILES)
+config: config.acdone
+install: config $(AC_FILES)
+confclean:
+	rm -f $(DISTCLEAN) $(CLEAN)
 configure.ac: configure.ac.tmpl VERSION
 	cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@
 
@@ -22,16 +27,10 @@ config.acdone: config.status
 	./config.status
 	touch $@
 
-%.mk: %.mk.in config.status
+$(TOPDIR)/make/%.mk: $(TOPDIR)/make/%.mk.in config.status
 	./config.status $@
 	touch $@
 
-%.h: %.h.in config.status
+$(TOPDIR)/make/%.h: $(TOPDIR)/make/%.h.in config.status
 	./config.status $@
 	touch $@
-
-config: config.acdone
-all: config $(AC_FILES)
-install: config $(AC_FILES)
-confclean:
-	rm -f $(DISTCLEAN) $(CLEAN)
diff --git a/make/defs.mk b/make/defs-orig.mk
similarity index 88%
rename from make/defs.mk
rename to make/defs-orig.mk
index 6fb52784..2e988be3 100644
--- a/make/defs.mk
+++ b/make/defs-orig.mk
@@ -3,44 +3,17 @@
 # contact@jannet.de
 # $Id$
 
-ifndef PROJECT
-	PROJECT := ytools
-endif
-	REQUIRED = inst/pre \
-			make \
-			doc \
-			debug misc slog platform \
-			devutil \
-			hash \
-			hexdump \
-			lbuffer \
-			debug \
-			cfgfile gtopts \
-			lock sigsync shmem \
-			usrv uclnt statecheck msgfmt \
-			YMisc YError \
-			YThread YMutex YEvent YCbContr contr/Y2WayMap \
-			YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
-			lib include bin \
-			inst/post
+include $(MODDIR)/make/projdefs.mk
 
-ifndef LIBNAME
-	LIBNAME := $(PROJECT)
-endif
-
-ifndef TOPDIR
-	TOPDIR := $(MODDIR)
-endif
-
-VERSION                = $(shell cat $(TOPDIR)/VERSION)
-WINVERSION             = $(shell cat $(TOPDIR)/VERSION | sed -e "s/\./_/g")
-LOCAL_VERSION          = $(shell cat $(TOPDIR)/VERSION)
-LOCAL_WINVERSION       = $(shell cat $(TOPDIR)/VERSION | sed -e "s/\./_/g")
+LIBNAME := $(PROJECT)
+WINVERSION             = $(shell echo $(VERSION) | sed -e "s/\./_/g")
+LOCAL_VERSION          = $(shell echo $(VERSION))
+LOCAL_WINVERSION       = $(shell echo $(VERSION) | sed -e "s/\./_/g")
 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 cat $(TOPDIR)/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
@@ -241,4 +214,3 @@ export LD_LIBRARY_PATH
 UPLOAD_URL_RPM_BIN=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/bin/
 UPLOAD_URL_RPM_SRC=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/src/
 
-
diff --git a/make/dirs.mk b/make/dirs.mk
index b0d6c68e..c8b2406f 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -12,7 +12,7 @@ clean distclean:
 .DEFAULT:
 install:
 else
-subdirs:
+subdirs all:
 	$(make_subdirs)
 
 clean distclean:
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
new file mode 100644
index 00000000..ad7902f0
--- /dev/null
+++ b/make/ytools.mk.in
@@ -0,0 +1,28 @@
+
+# (c) 2001 jannet it services
+# contact@jannet.de
+# $Id$
+
+PROJECT := ytools
+
+
+REQUIRED = inst/pre \
+		make \
+		doc \
+		debug misc slog platform \
+		devutil \
+		hash \
+		hexdump \
+		lbuffer \
+		debug \
+		cfgfile gtopts \
+		lock sigsync shmem \
+		usrv uclnt statecheck msgfmt \
+		YMisc YError \
+		YThread YMutex YEvent YCbContr contr/Y2WayMap \
+		YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
+		lib include bin \
+		inst/post
+
+VERSION                = @PACKAGE_VERSION@
+VERSION_STR            = \"@PACKAGE_VERSION@\"