diff --git a/ChangeLog b/ChangeLog
index 7b3a3cfe9..5a09fcf7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-15  Mike Kestner  <mkestner@novell.com>
+
+	* glade/Glade.metadata : mark Interface.toplevels private to allow
+	manual implementation.
+	* glade/Interface.custom : add manual impl for Toplevels and obsolete
+	old toplevels impl.
+	* glade/Makefile.am : add new custom.
+
 2005-09-15  Mike Kestner  <mkestner@novell.com>
 
 	* parser/gapi-fixup.cs : warn on unmatched rules.  reworked from a Dan
diff --git a/doc/en/Glade/Interface.xml b/doc/en/Glade/Interface.xml
index e91565a70..00fe03884 100644
--- a/doc/en/Glade/Interface.xml
+++ b/doc/en/Glade/Interface.xml
@@ -83,6 +83,11 @@
         <remarks>
         </remarks>
       </Docs>
+      <Attributes>
+        <Attribute>
+          <AttributeName>System.Obsolete(Message="Replaced by Toplevels property", IsError=False)</AttributeName>
+        </Attribute>
+      </Attributes>
     </Member>
     <Member MemberName="Requires">
       <MemberSignature Language="C#" Value="public string Requires;" />
@@ -121,10 +126,22 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>The number of Top Level Widget Definitions in the Interface.</summary>
         <remarks>
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Toplevels">
+      <MemberSignature Language="C#" Value="public Glade.WidgetInfo[] Toplevels { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Glade.WidgetInfo[]</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>The Top Level Widgets in the interface.</summary>
+        <value>an array of <see cref="T:Glade.WidgetInfo"/> structures.</value>
+        <remarks />
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/glade/Glade.metadata b/glade/Glade.metadata
index f029d9ff6..09fb56c46 100644
--- a/glade/Glade.metadata
+++ b/glade/Glade.metadata
@@ -5,4 +5,5 @@
   <attr path="/api/namespace/class[@name='Global']/method[@name='SetCustomHandler']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GladeXML']/method[@name='GetWidgetPrefix']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GladeInterface']" name="opaque">false</attr>
+  <attr path="/api/namespace/struct[@cname='GladeInterface']/field[@cname='toplevels']" name="access">private</attr>
 </metadata>
diff --git a/glade/Interface.custom b/glade/Interface.custom
new file mode 100644
index 000000000..32f4f8ed3
--- /dev/null
+++ b/glade/Interface.custom
@@ -0,0 +1,37 @@
+// Interface.custom
+//
+// Author: Mike Kestner <mkestner@novell.com>
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General 
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+		[Obsolete ("Replaced by Toplevels property")]
+		public Glade.WidgetInfo toplevels {
+			get { 
+				return Glade.WidgetInfo.New (_toplevels); 
+			}
+		}
+
+		public WidgetInfo[] Toplevels {
+			get {
+				WidgetInfo[] result = new WidgetInfo [NToplevels];
+				for (int i = 0; i < NToplevels; i++)
+					result [i] = WidgetInfo.New (Marshal.ReadIntPtr (_toplevels, i * IntPtr.Size));
+				return result;
+			}
+		}
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 6201f8a96..a1b6b0ed8 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -20,6 +20,7 @@ sources =				\
 
 customs =				\
 	Global.custom			\
+	Interface.custom		\
 	XML.custom
 
 add_dist = makefile.win32 glade-sharp-2.0.pc.in