diff --git a/ChangeLog b/ChangeLog
index fbf2cd60..21f1ec57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 18 16:57:20 2002  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* common.make: If REMOVE_EMPTY_DIRS is yes, remove efficiently all
+	empty directories from include and library flags (ie, -I and -L
+	flags).	 (Suggestion by Markus Hitter <mah@jump-ing.de>).
+	* target.make (REMOVE_EMPTY_DIRS): Set to yes in the case of OS X.
+
 Mon Mar 18 14:07:53 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* GNUstep-reset.sh: New file.  Sourcing this file resets the
diff --git a/target.make b/target.make
index 10687617..dd707806 100644
--- a/target.make
+++ b/target.make
@@ -336,6 +336,10 @@ DYLIB_CURRENT_VERSION       = -current_version 1
 DYLIB_INSTALL_NAME = \
 $(GNUSTEP_SYSTEM_ROOT)/$(TARGET_LIB_DIR)/$(LIBRARY_FILE)
 
+# Remove empty dirs from the compiler/linker flags (ie, remove -Idir and 
+# -Ldir flags where dir is empty).
+REMOVE_EMPTY_DIRS = yes
+
 ifeq ($(FOUNDATION_LIB),nx)
 DYLIB_DEF_FRAMEWORKS += -framework Foundation
 endif