diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index fa2b7428945..2b0348d9cb8 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-05  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* tools/helper.mk: Skip automatic dependency tracking if
+	DEPENDENCIES=no.
+
 2004-05-31  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* include/reactos/version.h (KERNEL_VERSION_BUILD_TYPE): Replace possible
diff --git a/reactos/tools/depend.mk b/reactos/tools/depend.mk
index 6cd82d07e6f..7aa7f403242 100644
--- a/reactos/tools/depend.mk
+++ b/reactos/tools/depend.mk
@@ -2,12 +2,10 @@
 # Define $DEP_OBJECTS before this file is included
 # $DEP_OBJECTS contain a list of object files that are checked for dependancies
 
+ifneq ($(DEPENDENCIES),no)
+
 DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(DEP_OBJECTS:.o=.d))
 DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED))))
-
-
-# I (Andrew Greenwood) had to add this to compile under MinGW:
-# SEP = /
  
 ifneq ($(MAKECMDGOALS),clean)
 -include $(DEP_FILES)
@@ -36,3 +34,5 @@ endif
 
 .%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(NASM_CMD) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
+
+endif