diff --git a/src/ChangeLog b/src/ChangeLog
index fc57bdaba26d61be5147c6b9cec7be5ee36963a5..9ce8dce36041956293138435955b3eb66e5208e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-18  Kenichi Handa  <handa@gnu.org>
+
+	* font.c (Ffont_spec): Signal an error for an invalid font name.
+
 2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Move functions from lisp.h to individual modules when possible.
diff --git a/src/font.c b/src/font.c
index 7bd44a5e52f7272f7b7e71b17d0dd71fbe51612d..231df2ef71a93523417408c91972f67a75f90f53 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3863,7 +3863,8 @@ usage: (font-spec ARGS...)  */)
       if (EQ (key, QCname))
 	{
 	  CHECK_STRING (val);
-	  font_parse_name (SSDATA (val), SBYTES (val), spec);
+	  if (font_parse_name (SSDATA (val), SBYTES (val), spec) < 0)
+	    error ("Invalid font name: %s", SSDATA (val));
 	  font_put_extra (spec, key, val);
 	}
       else