diff --git a/make/autoconf.mk b/make/autoconf.mk
index b92c8162..ace65a59 100644
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -3,17 +3,35 @@
 # contact@jannet.de
 # $Id$
 
-CLEAN += config.status 
+CLEAN += $(wildcard *.acdone)
 DISTCLEAN += configure config.log autoscan.log configure.ac config.status
+AC_FILES_IN = $(shell find . -name '*.in')
+AC_FILES    = $(basename $(AC_FILES_IN))
 
-configure.ac: configure.ac.tmpl $(TOPDIR)/VERSION
-	cat $< | sed -e "s/_VERSION_/`cat $(TOPDIR)/VERSION | sed 's/-dev//'`/" > $@
+configure.ac: configure.ac.tmpl VERSION
+	cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@
 
 configure: configure.ac
 	autoconf $< > $@
 	chmod 755 $@
 
 config.status: configure
-	./configure $(CONFIGURE_OPTS)
+	./configure --no-create $(CONFIGURE_OPTS)
 
-config: config.status
+config.acdone: config.status
+	./config.status
+	touch $@
+
+%.mk: %.mk.in config.status
+	./config.status $@
+	touch $@
+
+%.h: %.h.in config.status
+	./config.status $@
+	touch $@
+
+config: config.acdone
+all: config $(AC_FILES)
+install: config $(AC_FILES)
+configclean:
+	rm -f $(DISTCLEAN) $(CLEAN)