diff --git a/mk/nvme.unittest.mk b/mk/nvme.unittest.mk
index addfaa5c1..c7b523d6b 100644
--- a/mk/nvme.unittest.mk
+++ b/mk/nvme.unittest.mk
@@ -55,14 +55,9 @@ $(UT_APP) : $(OBJS)
 clean:
 	$(Q)rm -f $(UT_APP) $(OBJS) *.d
 
-%.o: $(NVME_DIR)/%.c
+%.o: $(NVME_DIR)/%.c %.d $(MAKEFILE_LIST)
 	@echo "  CC $@"
-	$(Q)$(CC) $(CFLAGS) -c $< -o $@
-	$(Q)$(CC) -MM $(CFLAGS) $(NVME_DIR)/$*.c > $*.d
-	@mv -f $*.d $*.d.tmp
-	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
-	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
-		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-	@rm -f $*.d.tmp
+	$(Q)$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
+	$(Q)mv -f $*.d.tmp $*.d
 
 include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index f4fd20bbc..ac7211740 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -88,15 +88,14 @@ CFLAGS   += $(COMMON_CFLAGS) -Wno-pointer-sign -std=gnu99
 
 MAKEFLAGS += --no-print-directory
 
-%.o : %.c
+DEPFLAGS = -MMD -MP -MF $*.d.tmp
+
+%.o: %.c %.d $(MAKEFILE_LIST)
 	@echo "  CC $@"
-	$(Q)$(CC) $(CFLAGS) -c $<
-	$(Q)$(CC) -MM $(CFLAGS) $*.c > $*.d
-	@mv -f $*.d $*.d.tmp
-	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
-	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
-		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-	@rm -f $*.d.tmp
+	$(Q)$(CC) $(DEPFLAGS) $(CFLAGS) -c $<
+	$(Q)mv -f $*.d.tmp $*.d
+
+%.d: ;
 
 DPDK_DIR ?= $(CONFIG_DPDK_DIR)
 DPDK_INC_DIR ?= $(DPDK_DIR)/include