diff --git a/Makefile.in b/Makefile.in
index f35b65fa..3c4e5b61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,7 @@ all: znc @MODTARGET@
 
 depend::
 	g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend
+	(cd modules; $(MAKE) depend)
 
 znc: $(OBJS)
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $(LIBS) $(OBJS)
@@ -23,10 +24,11 @@ znc-static: $(OBJS)
 	strip $@
 
 modules::
-	cd modules && ./buildmod --all
+	(cd modules; $(MAKE) all)
 
 clean:
 	rm -rf znc znc-static *.o core core.*
+	(cd modules; $(MAKE) clean)
 
 -include .depend
 
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 5fc57cb5..2e98ffcf 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -4,14 +4,14 @@ endif
 
 CXX=g++
 CXXFLAGS=@CXXFLAGS@
-INCLUDES=@INCLUDES@
+INCLUDES=@INCLUDES@ -I..
 LIBS=@LIBS@
 VPATH=.:..
 OBJS=$(addsuffix .o, $(basename $(wildcard *.cpp)))
 SRCS=$(wildcard *.cpp) $(wildcard ../*.cpp)
 
 
-all: $(addsuffix .so, $(basename $(wildcard *.cpp)))
+all: $(OBJS) $(addsuffix .so, $(basename $(wildcard *.cpp)))
 
 depend::
 	g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend