diff --git a/ChangeLog b/ChangeLog
index cdd2c7d09..a3f9b2b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+2007-03-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSServicesManager.m:
+	* Source/NSWorkspace.m:
+	Fix usage of NSSearchPathForDirectoriesInDomains() to match new
+	filesystem support changes.
+
 2007-03-04  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSSpellServer.m: deleted
 	* Source/GNUmakefile: remove NSSpellServer.m
-	* Source/NSSpellChecker.m: include NSSpellServer.h fro base
+	* Source/NSSpellChecker.m: include NSSpellServer.h from base
 	* Headers/AppKit/NSSpellServer.h: deleted
 	* Headers/AppKit/AppKit.h remove NSSpellServer.h
 	Moved NSSpellServer to base for macos-x compatibility.
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index 1971eb303..56c1ecd2a 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -521,9 +521,9 @@ static NSString         *disabledName = @".GNUstepDisabled";
 
   manager = [GSServicesManager alloc];
 
-  str = [NSSearchPathForDirectoriesInDomains(NSUserDirectory,
+  str = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
           NSUserDomainMask, YES) objectAtIndex: 0];
-  str = [str stringByAppendingPathComponent: @"Library/Services"];
+  str = [str stringByAppendingPathComponent: @"Services"];
   path = [str stringByAppendingPathComponent: servicesName];
   manager->_servicesPath = [path copy];
   path = [str stringByAppendingPathComponent: disabledName];
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index a90268803..e5a7b7e11 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -524,17 +524,15 @@ static NSString			*_rootPath = @"/";
 
       NS_DURING
 	{
-	  service = [[NSSearchPathForDirectoriesInDomains(NSUserDirectory, 
-							  NSUserDomainMask, 
-							  YES) 
-							 objectAtIndex: 0]
-		      stringByAppendingPathComponent: @"Library/Services"];
+	  service = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, 
+	    NSUserDomainMask, YES) objectAtIndex: 0]
+	    stringByAppendingPathComponent: @"Services"];
 	  
 	  /*
 	   *	Load file extension preferences.
 	   */
 	  extPrefPath = [service
-			  stringByAppendingPathComponent: @".GNUstepExtPrefs"];
+	    stringByAppendingPathComponent: @".GNUstepExtPrefs"];
 	  RETAIN(extPrefPath);
 	  if ([mgr isReadableFileAtPath: extPrefPath] == YES)
 	    {