diff --git a/gas/ChangeLog b/gas/ChangeLog
index 011b7d84804..f2e576e2db1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-18  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-arm.c (decode_shift): Replace as_tsktsk with as_warn.
+	Make reference to first element of shift_names explicit.
+
 2000-08-18  Alexandre Oliva  <aoliva@redhat.com>
 
 	* write.c (fixup_segment) [TC_DONT_FIX_NON_ADJUSTABLE]: Use
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index c6d79669691..faded9626bc 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -2608,8 +2608,8 @@ decode_shift (str, unrestrict)
 	     about this though.  */
 	  if (num == 0)
 	    {
-	      as_tsktsk (_("Shift of 0 ignored."));
-	      shift = shift_names;
+	      as_warn (_("Shift of 0 ignored."));
+	      shift = & shift_names[0];
 	      assert (shift->properties->index == SHIFT_LSL);
 	    }
 	  else