diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 169d79e787..257638b905 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-06  Andrew Cagney  <cagney@redhat.com>
+
+	* stack.c (return_command): Warn when STRUCT_CONVENTION, and not
+	REGISTER_CONVENTION.
+
 2003-11-06  Daniel Jacobowitz  <drow@mvista.com>
 
 	* breakpoint.c (insert_bp_location, allocate_bp_location): Make
diff --git a/gdb/stack.c b/gdb/stack.c
index 9dc7d8598d..723f1e57d0 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1861,7 +1861,7 @@ return_command (char *retval_exp, int from_tty)
 	{
 	  if (gdbarch_return_value (current_gdbarch, return_type,
 				    NULL, NULL, NULL)
-	      == RETURN_VALUE_REGISTER_CONVENTION)
+	      == RETURN_VALUE_STRUCT_CONVENTION)
 	    return_value = NULL;
 	}
       else