diff --git a/.gitignore b/.gitignore
index a8f5a2379116eb1c6ec4dec5082a1b0b5d6a903a..ed9bd45a45a01de5f402226e86b651994c502c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@ Makefile.config
 *.la
 *.o
 *.so
+*.dep
 *~
 
 # GNU Global
diff --git a/Makefile.lib b/Makefile.lib
index d681cf7412a2bcca3d341f77944651d482ad1933..1aec37c76f333c54baaa68f3885dbf5634ed6d9d 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -7,10 +7,10 @@ LIBS =
 QUIET = @
 
 %.o: %.cc
-	$(QUIET) g++ -o $@ -c $^ -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS)
+	$(QUIET) g++ -o $@ -c $< -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP
 
 %.o: %.c
-	$(QUIET) gcc -o $@ -c $^ -g -fPIC $(CFLAGS) $($@_CFLAGS)
+	$(QUIET) gcc -o $@ -c $< -g -fPIC $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP
 
 
 # Generate Make rules for libraries.
@@ -28,7 +28,9 @@ define LIBS_template =
   # Propagate CXXFLAGS to the individual object files.
   $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
 
-  clean_list += $$(_lib) $$(_objs)
+  include $$(wildcard $$(_d)/*.dep)
+
+  clean_list += $$(_lib) $$(_objs) $$(_d)*.dep
   libs_list += $$(_lib)
 endef
 
@@ -48,7 +50,7 @@ define PROGRAMS_template =
   # Propagate CXXFLAGS to the individual object files.
   $$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
 
-  clean_list += $$(_prog) $$(_objs)
+  clean_list += $$(_prog) $$(_objs) $$(_d)*.dep
   programs_list += $$(_prog)
 endef