diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1d4519d7026..1c107a43d05 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-08  Matthew Jacob  <mjacob@feral.com>
+
+	* config/tc-alpha.c (md_undefined_symbol): Properly understand that
+	$at is the integer register $r28, vs. both $r28 and the floating
+	point register $f28.
+
 2000-06-08  James E. Wilson  <wilson@cygnus.com>
 
 	* config/tc-ia64.c (generate_unwind_image): Call ia64_flush_insns.
diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 61dba4b8a4f..0eed2e2a6d5 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -1372,7 +1372,7 @@ md_undefined_symbol(name)
 	  else
 	    break;
 
-	  if (!alpha_noat_on && num == AXP_REG_AT)
+	  if (!alpha_noat_on && (num + is_float) == AXP_REG_AT)
 	    as_warn(_("Used $at without \".set noat\""));
 	  return alpha_register_table[num + is_float];