diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 24051fcdc48..28512d36439 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,4 +1,9 @@
-1999-08-09  Anthony Green  <green@cygnus.com>
+1999-08-08  Anthony Green  <green@cygnus.com>
+
+	* defineclass.cc (_Jv_VerifyClassName): Verify array names
+	correctly.
+
+1999-08-08  Anthony Green  <green@cygnus.com>
 
 	* gij.cc: New file.
 
@@ -30,7 +35,7 @@
 	* NEWS: More news.
 	* THANKS: More thanks.
 
-1999-08-09  Kresten Krab Thorup  <krab@gnu.org>
+1999-08-08  Kresten Krab Thorup  <krab@gnu.org>
 
 	* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
 	jchar type.
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 09f8f47fc84..e062fb2e756 100644
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -1414,6 +1414,14 @@ _Jv_VerifyClassName (unsigned char* ptr, _Jv_ushort length)
   unsigned char *limit = ptr+length;
   int ch;
 
+  if ('[' == UTF8_PEEK (ptr, limit))
+    {
+      if (! _Jv_VerifyOne (++ptr, limit, false))
+        throw_class_format_error ("erroneous class name");
+      else
+        return;
+    }
+
  next_level:
   do {
     if ((ch = UTF8_GET (ptr, limit))==-1)