diff --git a/ChangeLog b/ChangeLog
index cf8fe5a38..88db93c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSHelpManager.m:
+	* Source/GSServicesManager.m:
+	* Source/NSBundleAdditions.m:
+	* Source/NSSpellChecker.m:
+	Avoid calls to non-standard method.
+
 2011-03-05 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSNibLoading.m (NSCustomView): Correct implementation of
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index 06ad38edc..a99c758ac 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -927,7 +927,8 @@ static NSString         *disabledName = @".GNUstepDisabled";
   if (_allServices == nil)
     return;
 
-  newLang = AUTORELEASE([[NSUserDefaults userLanguages] mutableCopy]);
+  newLang = [[[[NSUserDefaults standardUserDefaults]
+    stringArrayForKey: @"NSLanguages"] mutableCopy] autorelease];
   if (newLang == nil)
     {
       newLang = [NSMutableArray arrayWithCapacity: 1];
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index fae5aa75e..3c803e294 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -282,12 +282,15 @@
 - (NSString *) pathForNibResource: (NSString *)fileName
 {
   NSMutableArray	*array = [NSMutableArray arrayWithCapacity: 8];
-  NSArray		*languages = [NSUserDefaults userLanguages];
+  NSArray		*languages;
   NSString		*rootPath = [self bundlePath];
   NSString		*primary;
   NSString		*language;
   NSEnumerator		*enumerator;
 
+  languages = [[NSUserDefaults standardUserDefaults]
+    stringArrayForKey: @"NSLanguages"];
+
   /*
    * Build an array of resource paths that differs from the normal order -
    * we want a localized file in preference to a generic one.
diff --git a/Source/NSHelpManager.m b/Source/NSHelpManager.m
index 6748f36a6..dc70ec342 100644
--- a/Source/NSHelpManager.m
+++ b/Source/NSHelpManager.m
@@ -57,12 +57,14 @@
 {
   NSFileManager *fm = [NSFileManager defaultManager];
   NSMutableArray *array = [NSMutableArray array];
-  NSArray *languages = [NSUserDefaults userLanguages];
+  NSArray *languages;
   NSString *rootPath = [self bundlePath];
   NSString *primary;
   NSString *language;
   NSEnumerator *enumerator;
   
+  languages = [[NSUserDefaults standardUserDefaults]
+    stringArrayForKey: @"NSLanguages"];
   primary = [rootPath stringByAppendingPathComponent: @"Resources"];
   
   enumerator = [languages objectEnumerator];
diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m
index b90be1e53..d6e6a74cb 100644
--- a/Source/NSSpellChecker.m
+++ b/Source/NSSpellChecker.m
@@ -264,14 +264,16 @@ static int __documentTag = 0;
 //
 - init
 {
-  NSArray *userLanguages = [NSUserDefaults userLanguages];  
+  NSArray *languages;
 
   self = [super init];
   if (self == nil)
     return nil;
 
+  languages = [[NSUserDefaults standardUserDefaults]
+    stringArrayForKey: @"NSLanguages"];
   // Set the language to the default for the user.
-  _language = [userLanguages objectAtIndex: 0];
+  _language = [languages objectAtIndex: 0];
   _wrapFlag = NO;
   _position = 0;
   _spellPanel = nil;