diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index a0111eaf..0c45e324 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -36,7 +36,7 @@ LOCAL_C     = $(wildcard *.c)
 LOCAL_CPP   = $(wildcard *.c *.cpp *.cc *.C)
 LOCAL_CSRC  = $(LOCAL_H) $(LOCAL_C) $(LOCAL_CPP)
 
-PREREQ_DIR  = $(patsubst %,$(TOPDIR)/%,$(LOCAL_PREREQ))
+PREREQ_DIR  = $(patsubst %,$(MODDIR)/%,$(LOCAL_PREREQ))
 PREREQ_DONE = $(patsubst %,%/all.done,$(PREREQ_DIR))
 PREREQ_H    = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h))  
 PREREQ_C    = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) 
diff --git a/make/rules.mk b/make/rules.mk
index 9daf8ec0..fc06ad46 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -3,7 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-all.done: $(ALL)
+all.done: $(PREREQ_DONE) $(ALL)
 	touch $@
 
 %.done:
@@ -73,7 +73,7 @@ allclean:
 	rm -rf $(ALL)
 
 doneclean:
-	rm -rf *.done
+	rm -rf *.done $(PREREQ_DONE)
 
 execlean: allclean objclean textclean