diff --git a/gas/ChangeLog b/gas/ChangeLog
index a5a20470d9..d5452d0990 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (s_cpsetup): Fix initialization of
+	mips_cpreturn_register and mips_cpreturn_offset.
+
 2002-05-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* config/tc-mips.c (s_cpsetup): Fix comment.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 92789e7063..1b738b5fad 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -11876,12 +11876,18 @@ s_cpsetup (ignore)
       return;
     }
   else
-    input_line_pointer++;
+    ++input_line_pointer;
   SKIP_WHITESPACE ();
   if (*input_line_pointer == '$')
-    mips_cpreturn_register = tc_get_register (0);
+    {
+      mips_cpreturn_register = tc_get_register (0);
+      mips_cpreturn_offset = -1;
+    }
   else
-    mips_cpreturn_offset = get_absolute_expression ();
+    {
+      mips_cpreturn_offset = get_absolute_expression ();
+      mips_cpreturn_register = -1;
+    }
   SKIP_WHITESPACE ();
   if (*input_line_pointer != ',')
     {