diff --git a/ChangeLog b/ChangeLog
index fef2b7d84..996c167fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* Source/NSPredicate.m: ([-parseOr]) Use orPredicateWithSubpredicates
 	rather than andPredicateWithSubpredicates.  Fix for bug #19446.
 	* Source/unix/NSStream.m: Fix memory leak.
+	* Source/NSPathUtilities.m: NSSearchPathForDirectoriesInDomains()
+	Don't include empty paths.
 
 2007-03-25  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m
index ad22d7532..5f1a417fe 100644
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@@ -1622,13 +1622,13 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
 if (domainMask & mask) \
 { \
   path = [base_dir stringByAppendingPathComponent: add_dir]; \
-  if (path != nil && [paths containsObject: path] == NO) \
+  if ([path length] > 0 && [paths containsObject: path] == NO) \
     [paths addObject: path]; \
 }
 #define ADD_PLATFORM_PATH(mask, add_dir) \
 if (domainMask & mask) \
 { \
-  if (add_dir != nil && [paths containsObject: add_dir] == NO) \
+  if ([add_dir length] > 0 && [paths containsObject: add_dir] == NO) \
     [paths addObject: add_dir]; \
 }