diff --git a/gas/ChangeLog b/gas/ChangeLog
index e04a49f7ce..8196733b2b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (match_template): Improve unsupported error
+	message.
+
 2012-05-03  Sean Keys  <skeys@ipdatasys.com>
 
 	* configure, Makefile.in: Regenerate.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index ae0b436b7b..3e47349d80 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4353,8 +4353,9 @@ check_reverse:
 	  err_msg = _("unsupported syntax");
 	  break;
 	case unsupported:
-	  err_msg = _("unsupported");
-	  break;
+	  as_bad (_("unsupported `%s'"),
+		  current_templates->start->name);
+	  return NULL;
 	case invalid_vsib_address:
 	  err_msg = _("invalid VSIB address");
 	  break;