diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f870e1c7ad5..fd1e5ceaea9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-06  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (awt_java_source_files): Added new file.
+	* java/awt/GridBagConstraints.java: New file.
+
 2000-12-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/text/Collator.java (decomposeCharacter, decmp, strength):
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index c618f327a67..83a1cfc0dd2 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -592,6 +592,7 @@ java/awt/Frame.java \
 java/awt/Graphics.java \
 java/awt/Graphics2D.java \
 java/awt/GraphicsConfiguration.java \
+java/awt/GridBagConstraints.java \
 java/awt/GridLayout.java \
 java/awt/IllegalComponentStateException.java \
 java/awt/Image.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f2426faee19..396d34de4c2 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -363,6 +363,7 @@ java/awt/Frame.java \
 java/awt/Graphics.java \
 java/awt/Graphics2D.java \
 java/awt/GraphicsConfiguration.java \
+java/awt/GridBagConstraints.java \
 java/awt/GridLayout.java \
 java/awt/IllegalComponentStateException.java \
 java/awt/Image.java \
@@ -1329,7 +1330,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/FlowLayout.P .deps/java/awt/Font.P \
 .deps/java/awt/FontMetrics.P .deps/java/awt/Frame.P \
 .deps/java/awt/Graphics.P .deps/java/awt/Graphics2D.P \
-.deps/java/awt/GraphicsConfiguration.P .deps/java/awt/GridLayout.P \
+.deps/java/awt/GraphicsConfiguration.P \
+.deps/java/awt/GridBagConstraints.P .deps/java/awt/GridLayout.P \
 .deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
 .deps/java/awt/Insets.P .deps/java/awt/ItemSelectable.P \
 .deps/java/awt/Label.P .deps/java/awt/LayoutManager.P \
diff --git a/libjava/java/awt/GridBagConstraints.java b/libjava/java/awt/GridBagConstraints.java
new file mode 100644
index 00000000000..34ca0c61b51
--- /dev/null
+++ b/libjava/java/awt/GridBagConstraints.java
@@ -0,0 +1,89 @@
+// GridBagConstraints.java - Constraints for GridBag layout manager
+
+/* Copyright (C) 2000  Free Software Foundation
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+package java.awt;
+
+import java.io.Serializable;
+
+/** This specifies the constraints for a component managed by the
+ * GridBagLayout layout manager.  */
+public class GridBagConstraints implements Cloneable, Serializable
+{
+  /** Fill in both directions.  */
+  public static final int BOTH;
+  /** Don't fill.  */
+  public static final int NONE;
+  /** Fill horizontally.  */
+  public static final int HORIZONTAL;
+  /** Fill vertically.  */
+  public static final int VERTICAL;
+
+  /** Position in the center.  */
+  public static final int CENTER;
+  /** Position to the east.  */
+  public static final int EAST;
+  /** Position to the north.  */
+  public static final int NORTH;
+  /** Position to the northeast.  */
+  public static final int NORTHEAST;
+  /** Position to the northwest.  */
+  public static final int NORTHWEST;
+  /** Position to the south.  */
+  public static final int SOUTH;
+  /** Position to the southeast.  */
+  public static final int SOUTHEAST;
+  /** Position to the southwest.  */
+  public static final int SOUTHWEST;
+  /** Position to the west.  */
+  public static final int WEST;
+
+  /** Occupy all remaining cells except last cell.  */
+  public static final int RELATIVE;
+  /** Occupy all remaining cells.  */
+  public static final int REMAINDER;
+
+  public int anchor;
+  public int fill;
+  public int gridheight;
+  public int gridwidth;
+  public int gridx;
+  public int gridy;
+  public Insets insets;
+  public int ipadx;
+  public int ipady;
+  public double weightx;
+  public double weighty;
+
+  /** Create a copy of this object.  */
+  public Object clone ()
+  {
+    // This is lazy but it works.
+    GridBagConstraints g = (GridBagConstraints) super.clone ();
+    g.insets = (Insets) insets.clone ();
+    return g;
+  }
+
+  /** Create a new GridBagConstraints object with the default
+   * parameters.  */
+  public GridBagConstraints ()
+  {
+    this.anchor = CENTER;
+    this.fill = NONE;
+    this.gridx = RELATIVE;
+    this.gridy = RELATIVE;
+    this.gridwidth = 1;
+    this.gridheight = 1;
+    this.ipadx = 0;
+    this.ipady = 0;
+    this.insets = new Insets (0, 0, 0, 0);
+    this.weightx = 0;
+    this.weighty = 0;
+  }
+}