diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 207feda1f7a..80a9e86e79b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-07  Tom Tromey  <tromey@cygnus.com>
+
+	* java/lang/natClass.cc (getClasses): Wrote.
+
 2000-01-06  Tom Tromey  <tromey@cygnus.com>
 
 	* java/lang/natClass.cc (_getConstructors): Correctly check
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 07a1e1d7620..3e410e62471 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -367,8 +367,11 @@ java::lang::Class::getName (void)
 JArray<jclass> *
 java::lang::Class::getClasses (void)
 {
-  // FIXME: implement.
-  return NULL;
+  // Until we have inner classes, it always makes sense to return an
+  // empty array.
+  JArray<jclass> *result
+    = (JArray<jclass> *) JvNewObjectArray (0, &ClassClass, NULL);
+  return result;
 }
 
 JArray<jclass> *