diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 38eee7084c2fdf56b0516d452018f3860f0f0fcb..76e330cf3806a8e23aa9a81dd599b21f948cccb2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-27  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c:
+	Create vbox and layout for GtkPlug.
+
 2003-07-27  Michael Koch  <konqueror@gmx.de>
 
 	* java/awt/Window.java
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
index c4613a99f9175c8db0893fbc7bbcf60c614d98ad..ca4224733fd24c1b0c2c51ca509f76d8659659c9 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
@@ -40,17 +40,26 @@ exception statement from your version. */
 #include "gtkpeer.h"
 #include "gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h"
 
-JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create 
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create
   (JNIEnv *env, jobject obj)
 {
   gpointer window;
+  GtkWidget *vbox, *layout;
 
   gdk_threads_enter ();
 
   /* Create an "unplugged" GtkPlug. */
   window = gtk_plug_new (0);
 
+  vbox = gtk_vbox_new (0, 0);
+  layout = gtk_layout_new (NULL, NULL);
+  gtk_box_pack_end (GTK_BOX (vbox), layout, 1, 1, 0);
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  gtk_widget_show (layout);
+  gtk_widget_show (vbox);
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, window);
@@ -67,6 +76,6 @@ Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct
   gdk_threads_enter ();
 
   gtk_plug_construct (GTK_PLUG (ptr), window_id);
-  
+
   gdk_threads_leave ();
 }