diff --git a/Makefile b/Makefile
index 17596125..47536cad 100644
--- a/Makefile
+++ b/Makefile
@@ -21,21 +21,9 @@ SUBDIRS = inst/pre \
 
 ifneq ($(wildcard $(MODDIR)/make/ytools.mk),)
 
-all:
-	echo hallo
-	$(make_subdirs_target)
-
-clean distclean:
-	rm -rf $(CLEAN) $(DISTCLEAN)
-	$(make_subdirs_target)
-
-install: all
-	$(make_subdirs_target)
-	make $(INSTALLED_VERSION_FILE)
-
 include $(MODDIR)/make/ytools.mk
-
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/subdirs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/rpmdist.mk
 
diff --git a/make/Makefile b/make/Makefile
index a8f56c38..ee50a056 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -6,3 +6,6 @@
 MODDIR = ..
 include $(MODDIR)/make/ytools.mk
 include $(MODDIR)/make/make.mk
+
+tst:
+	echo $(AC_FILES_IN)
diff --git a/make/autoconf.mk b/make/autoconf.mk
index 179725dd..a1e0b097 100644
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -9,7 +9,7 @@ AC_FILES_IN = $(shell find . -name '*.in' | grep -ve "contrib\|dist")
 AC_FILES    = $(basename $(AC_FILES_IN))
 
 all: config $(AC_FILES)
-config: config.acdone
+config: config.acdone $(AC_FILES)
 install: config $(AC_FILES)
 confclean:
 	rm -f $(DISTCLEAN) $(CLEAN)
@@ -31,6 +31,6 @@ $(TOPDIR)/make/%.mk: $(TOPDIR)/make/%.mk.in config.status
 	./config.status $@
 	touch $@
 
-$(TOPDIR)/make/%.h: $(TOPDIR)/make/%.h.in config.status
+$(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status
 	./config.status $@
 	touch $@
diff --git a/make/dirs.mk b/make/dirs.mk
index 5c8f6973..7b3cd5f4 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -15,10 +15,13 @@ else
 subdirs all:
 	$(make_subdirs)
 
-install clean distclean:
-	rm -rf $(TEXTCLEAN) $(CLEAN) $(DISTCLEAN) dist *.done *~ .*.swp *.tmp core *.rep
+install clean:
+	rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
 	$(make_subdirs_target)
 
+distclean: clean
+	rm -rf $(DISTCLEAN)
+
 .DEFAULT:
 	$(make_subdirs_target)
 #
diff --git a/make/rules.mk b/make/rules.mk
index 75241859..212172ef 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -169,7 +169,7 @@ doneclean:
 execlean: allclean objclean textclean
 
 distclean: clean objclean textclean tmpclean vcdistclean profclean timerclean
-	rm -rf $(CLEAN) $(DISTCLEAN)
+	rm -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES)
 
 localclean: $(LOCAL_CLEAN)
 	rm -rf $(CLEAN)