diff --git a/ChangeLog b/ChangeLog
index 4c3e54e13..b8d586421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSUserDefaults.m: Changed ([+setUserLanguages:]) to use
+	NSLanguages.
+	* Documentation/gsdoc/NSUserDefaults.gsdoc: documented the
+	([+setUserlanguages:]) method.
+
 2001-03-04  Jonathan Gapen  <jagapen@home.com>
 
 	* Documentation/gsdoc/NSCharacterSet.gsdoc: Documented some methods.
diff --git a/Documentation/gsdoc/NSUserDefaults.gsdoc b/Documentation/gsdoc/NSUserDefaults.gsdoc
index 20232049c..3639e7edb 100644
--- a/Documentation/gsdoc/NSUserDefaults.gsdoc
+++ b/Documentation/gsdoc/NSUserDefaults.gsdoc
@@ -99,6 +99,15 @@
           </desc>
 	  <standards><GNUstep/><NotMacOS-X/><NotOpenStep/></standards>
 	</method>
+        <method type="void" factory="yes">
+          <sel>setUserLanguages:</sel>
+          <arg type="NSArray*">languages</arg>
+          <desc>
+	    Sets the array of user languages preferences.  Places the specified
+	    array in the <em>NSLanguages</em> user default.
+          </desc>
+	  <standards><GNUstep/><NotMacOS-X/><NotOpenStep/></standards>
+	</method>
         <method type="NSArray*">
           <sel>arrayForKey:</sel>
           <arg type="NSString*">defaultName</arg>
diff --git a/Source/GSFFCallInvocation.m b/Source/GSFFCallInvocation.m
index bc7938c2c..6fad8ab0d 100644
--- a/Source/GSFFCallInvocation.m
+++ b/Source/GSFFCallInvocation.m
@@ -152,7 +152,7 @@ GSFFCallInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
 {
   int      i;
   av_alist alist;
-  NSInvocation_t *inv = _inv;
+  NSInvocation_t *inv = (NSInvocation_t*)_inv;
   void *retval = inv->_retval;
 
   /* Do an av call starting with the return type */
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index c43f36998..efe92e5b5 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -381,10 +381,10 @@ static BOOL setSharedDefaults = NO;	/* Flag to prevent infinite recursion */
   NSMutableDictionary	*globDict = [[self standardUserDefaults] 
 			    persistentDomainForName: NSGlobalDomain];
 	
-  if (!languages)          // Remove the entry
-    [globDict removeObjectForKey: @"Languages"];
+  if (languages == nil)          // Remove the entry
+    [globDict removeObjectForKey: @"NSLanguages"];
   else
-    [globDict setObject: languages forKey: @"Languages"];
+    [globDict setObject: languages forKey: @"NSLanguages"];
   [[self standardUserDefaults] 
     setPersistentDomain: globDict forName: NSGlobalDomain];
   return;