diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 305fae8da69..2cfbf3271c9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 13 11:36:51 2000  Hans Boehm <boehm@acm.org>
+
+	* typeck.c (build_prim_array_type): Correctly set the high word too.
+
 2000-03-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
 	* parse.y (qualify_ambiguous_name): Properly handle expressions
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 4a46d42c636..8ebb4472ab0 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -360,7 +360,7 @@ build_prim_array_type (element_type, length)
      tree element_type;
      HOST_WIDE_INT length;
 {
-  tree max_index = build_int_2 (length - 1, 0);
+  tree max_index = build_int_2 (length - 1, (0 == length ? -1 : 0));
   TREE_TYPE (max_index) = sizetype;
   return build_array_type (element_type, build_index_type (max_index));
 }