diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1d6972a4d10..be5d6c9fc0c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-02  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (awt_java_source_files): Added new files.
+	* java/awt/CardLayout.java: New file.
+	* java/awt/AWTPermission.java: New file.
+
 2000-12-01  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/Vector.java (insertElementAt): Unconditionally
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index b29f8ca8f8f..9d3389e64ad 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -563,11 +563,13 @@ java/awt/AWTError.java \
 java/awt/AWTEvent.java \
 java/awt/AWTEventMulticaster.java \
 java/awt/AWTException.java \
+java/awt/AWTPermission.java \
 java/awt/ActiveEvent.java \
 java/awt/Adjustable.java \
 java/awt/BorderLayout.java \
 java/awt/Button.java \
 java/awt/Canvas.java \
+java/awt/CardLayout.java \
 java/awt/Checkbox.java \
 java/awt/CheckboxGroup.java \
 java/awt/CheckboxMenuItem.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index af4520c28c0..d566cc57abe 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -334,11 +334,13 @@ java/awt/AWTError.java \
 java/awt/AWTEvent.java \
 java/awt/AWTEventMulticaster.java \
 java/awt/AWTException.java \
+java/awt/AWTPermission.java \
 java/awt/ActiveEvent.java \
 java/awt/Adjustable.java \
 java/awt/BorderLayout.java \
 java/awt/Button.java \
 java/awt/Canvas.java \
+java/awt/CardLayout.java \
 java/awt/Checkbox.java \
 java/awt/CheckboxGroup.java \
 java/awt/CheckboxMenuItem.java \
@@ -1310,9 +1312,10 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/applet/AppletStub.P .deps/java/applet/AudioClip.P \
 .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \
 .deps/java/awt/AWTEventMulticaster.P .deps/java/awt/AWTException.P \
-.deps/java/awt/ActiveEvent.P .deps/java/awt/Adjustable.P \
-.deps/java/awt/BorderLayout.P .deps/java/awt/Button.P \
-.deps/java/awt/Canvas.P .deps/java/awt/Checkbox.P \
+.deps/java/awt/AWTPermission.P .deps/java/awt/ActiveEvent.P \
+.deps/java/awt/Adjustable.P .deps/java/awt/BorderLayout.P \
+.deps/java/awt/Button.P .deps/java/awt/Canvas.P \
+.deps/java/awt/CardLayout.P .deps/java/awt/Checkbox.P \
 .deps/java/awt/CheckboxGroup.P .deps/java/awt/CheckboxMenuItem.P \
 .deps/java/awt/Choice.P .deps/java/awt/Color.P \
 .deps/java/awt/Component.P .deps/java/awt/ComponentOrientation.P \
diff --git a/libjava/java/awt/AWTPermission.java b/libjava/java/awt/AWTPermission.java
new file mode 100644
index 00000000000..b4cf1938fa9
--- /dev/null
+++ b/libjava/java/awt/AWTPermission.java
@@ -0,0 +1,44 @@
+// AWTPermission.java - AWT permissions
+
+/* 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.  */
+
+/**
+ * @author Tom Tromey <tromey@redhat.com>
+ * @date December 2, 2000
+ */
+
+package java.awt;
+
+import java.security.BasicPermission;
+
+/**
+ * This class implements permissions for AWT.  This is a named
+ * permission.  No actions are defined.
+ */
+public final class AWTPermission extends BasicPermission
+{
+  /**
+   * Construct a AWTPermission with the given name.
+   * @param name The permission name
+   */
+  public AWTPermission (String name)
+  {
+    super (name);
+  }
+
+  /**
+   * Construct a AWTPermission with the given name.
+   * @param name The permission name
+   * @param actions The actions; this is ignored and should be null.
+   */
+  public AWTPermission (String name, String actions)
+  {
+    super (name, actions);
+  }
+}
diff --git a/libjava/java/awt/CardLayout.java b/libjava/java/awt/CardLayout.java
new file mode 100644
index 00000000000..eaa722b623e
--- /dev/null
+++ b/libjava/java/awt/CardLayout.java
@@ -0,0 +1,357 @@
+// CardLayout.java - Card-based layout engine
+
+/* 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.util.Enumeration;
+import java.util.Hashtable;
+import java.io.Serializable;
+
+/** This class implements a card-based layout scheme.  Each included
+ * component is treated as a card.  Only one card can be shown at a
+ * time.  This class includes methods for changing which card is
+ * shown.
+ *
+ * @verson 0.0
+ * @author Tom Tromey <tromey@redhat.com>
+ * @date December 2, 2000
+ */
+public class CardLayout implements LayoutManager2, Serializable
+{
+  /** Create a new CardLayout object with both gaps zero.  */
+  public CardLayout ()
+  {
+    this (0, 0);
+  }
+
+  /** Create a new CardLayout object with the specified horizontal and
+   * vertical gaps.
+   * @param hgap The horizontal gap
+   * @param vgap The vertical gap
+   */
+  public CardLayout (int hgap, int vgap)
+  {
+    this.hgap = hgap;
+    this.vgap = vgap;
+    this.map = new Hashtable ();
+  }
+
+  /** Add a new component to the layout.  The constraint must be a
+   * string which is used to name the component.  This string can
+   * later be used to refer to the particular component.
+   * @param comp The component to add
+   * @param constraints The name by which the component can later be called
+   * @exception IllegalArgumentException If `constraints' is not a string
+   */
+  public void addLayoutComponent (Component comp, Object constraints)
+  {
+    if (! (constraints instanceof String))
+      throw new IllegalArgumentException ("Object " + constraints
+					  + " is not a string");
+    map.put (constraints, comp);
+  }
+
+  /** Add a new component to the layout.  The name can be used later
+   * to refer to the component.
+   * @param name The name by which the component can later be called
+   * @param comp The component to add
+   * @deprecated
+   */
+  public void addLayoutComponent (String name, Component comp)
+  {
+    addLayoutComponent (comp, name);
+  }
+
+  /** Cause the first component in the container to be displayed.
+   * @param parent The parent container
+   */
+  public void first (Container parent)
+  {
+    gotoComponent (parent, FIRST, null);
+  }
+
+  /** Return this layout manager's horizontal gap.  */
+  public int getHgap ()
+  {
+    return hgap;
+  }
+
+  /** Return this layout manager's x alignment.  This method always
+   * returns Component.CENTER_ALIGNMENT.
+   * @param parent Container using this layout manager instance
+   */
+  public float getLayoutAlignmentX (Container parent)
+  {
+    return Component.CENTER_ALIGNMENT;
+  }
+
+  /** Returns this layout manager's y alignment.  This method always
+   * returns Component.CENTER_ALIGNMENT.
+   * @param parent Container using this layout manager instance
+   */
+  public float getLayoutAlignmentY (Container parent)
+  {
+    return Component.CENTER_ALIGNMENT;
+  }
+
+  /** Return this layout manager's vertical gap.  */
+  public int getVgap ()
+  {
+    return vgap;
+  }
+
+  /** Invalidate this layout manager's state.  */
+  public void invalidateLayout (Container target)
+  {
+    // Do nothing.
+  }
+
+  /** Cause the last component in the container to be displayed.
+   * @param parent The parent container
+   */
+  public void last (Container parent)
+  {
+    gotoComponent (parent, LAST, null);
+  }
+
+  /** Lay out the container's components based on the current
+   * settings.
+   * @param parent The parent container
+   */
+  public void layoutContainer (Container parent)
+  {
+    // FIXME: can we just use the width and height fields of parent?
+    // Or will that break with subclassing?
+    Dimension d = parent.getSize ();
+
+    Insets ins = parent.getInsets ();
+
+    int num = parent.getComponentCount ();
+    // This is more efficient than calling getComponents().
+    Component[] comps = parent.component;
+    
+    for (int i = 0; i < num; ++i)
+      {
+	if (comps[i].isVisible ())
+	  {
+	    // Only resize the one we care about.
+	    comps[i].setBounds (hgap + ins.left, vgap + ins.top,
+				d.width - 2 * hgap - ins.left - ins.right,
+				d.height - 2 * vgap - ins.top - ins.bottom);
+	    break;
+	  }
+      }
+  }
+
+  /** Get the maximum layout size of the container.
+   * @param target The parent container
+   */
+  public Dimension maximumLayoutSize (Container target)
+  {
+    // The JCL says that this returns Integer.MAX_VALUE for both
+    // dimensions.  But that just seems wrong to me.
+    return getSize (target, MAX);
+  }
+
+  /** Get the minimum layout size of the container.
+   * @param target The parent container
+   */
+  public Dimension minimumLayoutSize (Container target)
+  {
+    return getSize (target, MIN);
+  }
+
+  /** Cause the next component in the container to be displayed.
+   * @param parent The parent container
+   */
+  public void next (Container parent)
+  {
+    gotoComponent (parent, NEXT, null);
+  }
+
+  /** Get the preferred layout size of the container.
+   * @param target The parent container
+   */
+  public Dimension preferredLayoutSize (Container parent)
+  {
+    return getSize (parent, PREF);
+  }
+
+  /** Cause the previous component in the container to be displayed.
+   * @param parent The parent container
+   */
+  public void previous (Container parent)
+  {
+    gotoComponent (parent, PREV, null);
+  }
+
+  /** Remove the indicated component from this layout manager.
+   * @param comp The component to remove
+   */
+  public void removeLayoutComponent (Component comp)
+  {
+    Enumeration e = map.keys ();
+    while (e.hasMoreElements ())
+      {
+	Object key = e.nextElement ();
+	if (map.get (key) == comp)
+	  {
+	    map.remove (key);
+	    break;
+	  }
+      }
+  }
+
+  /** Set this layout manager's horizontal gap.
+   * @param hgap The new gap
+   */
+  public void setHgap (int hgap)
+  {
+    this.hgap = hgap;
+  }
+
+  /** Set this layout manager's vertical gap.
+   * @param vgap The new gap
+   */
+  public void setVgap (int vgap)
+  {
+    this.vgap = vgap;
+  }
+
+  /** Cause the named component to be shown.  If the component name is
+   * unknown, this method does nothing.
+   * @param parent The parent container
+   * @param name The name of the component to show
+   */
+  public void show (Container parent, String name)
+  {
+    Object target = map.get (name);
+    if (target != null)
+      gotoComponent (parent, NONE, (Component) target);
+  }
+
+  public String toString ()
+  {
+    return getClass ().getName () + "[" + hgap + "," + vgap + "]";
+  }
+
+  // This implements first(), last(), next(), and previous().
+  private void gotoComponent (Container parent, int what,
+			      Component target)
+  {
+    int num = parent.getComponentCount ();
+    // This is more efficient than calling getComponents().
+    Component[] comps = parent.component;
+    int choice = -1;
+
+    if (what == FIRST)
+      choice = 0;
+    else if (what == LAST)
+      choice = num;
+    else if (what >= 0)
+      choice = what;
+
+    for (int i = 0; i < num; ++i)
+      {
+	// If TARGET is set then we are looking for a specific
+	// component.
+	if (target != null)
+	  {
+	    if (target == comps[i])
+	      choice = i;
+	  }
+
+	if (comps[i].isVisible ())
+	  {
+	    if (what == NEXT)
+	      {
+		choice = i + 1;
+		if (choice == num)
+		  choice = num - 1;
+	      }
+	    else if (what == PREV)
+	      {
+		choice = i - 1;
+		if (choice < 0)
+		  choice = 0;
+	      }
+	    else
+	      {
+		// Do nothing if we're already looking at the right
+		// component.
+		if (choice == i)
+		  return;
+	      }
+	    comps[i].setVisible (false);
+
+	    if (choice >= 0)
+	      break;
+	  }
+      }
+
+    comps[choice].setVisible (true);
+  }
+
+  // Compute the size according to WHAT.
+  private Dimension getSize (Container parent, int what)
+  {
+    int w = 0, h = 0, num = parent.getComponentCount ();
+    // This is more efficient than calling getComponents().
+    Component[] comps = parent.component;
+
+    for (int i = 0; i < num; ++i)
+      {
+	// FIXME: can we just directly read the fields in Component?
+	// Or will that not work with subclassing?
+	Dimension d;
+
+	if (what == MIN)
+	  d = comps[i].getMinimumSize ();
+	else if (what == MAX)
+	  d = comps[i].getMaximumSize ();
+	else
+	  d = comps[i].getPreferredSize ();
+
+	w = Math.max (d.width, w);
+	h = Math.max (d.height, h);
+      }
+
+    Insets i = parent.getInsets ();
+    w += 2 * hgap + i.right + i.left;
+    h += 2 * vgap + i.bottom + i.top;
+
+    // Handle overflow.
+    if (w < 0)
+      w = Integer.MAX_VALUE;
+    if (h < 0)
+      h = Integer.MAX_VALUE;
+
+    return new Dimension (w, h);
+  }
+
+  // The gaps.
+  private int hgap;
+  private int vgap;
+
+  // This hashtable maps a name to a component.
+  private Hashtable map;
+
+  // These constants are used by the private gotoComponent method.
+  private int FIRST = 0;
+  private int LAST = 1;
+  private int NEXT = 2;
+  private int PREV = 3;
+  private int NONE = 4;
+
+  // These constants are used by the private getSize method.
+  private int MIN = 0;
+  private int MAX = 1;
+  private int PREF = 2;
+}