diff --git a/ChangeLog b/ChangeLog
index f0e72a54e..485e5b6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-20  Mike Kestner  <mkestner@novell.com>
+
+	* parser/gapi-parser.cs : add a directory element with child exclude
+	elements to simplify source version updating. 
+	* sources/gtk-sharp-sources.xml : switch to directory elements.
+
 2005-04-19  Mike Kestner  <mkestner@novell.com>
 
 	* gdk/Gdk.metadata : add a None member to ModifierType and fix the
diff --git a/parser/gapi-parser.cs b/parser/gapi-parser.cs
index ae9956b3f..b4df40030 100644
--- a/parser/gapi-parser.cs
+++ b/parser/gapi-parser.cs
@@ -106,11 +106,34 @@ namespace GtkSharp.Parsing {
 								Console.Write ("<exclude {0}> ", excfile);
 								excludes [excfile] = 1;
 								break;
+							case "directory":
+								string dir_path = elem.GetAttribute ("path");
+								Console.Write ("<directory {0}: excluding ", dir_path);
+								Hashtable excs = new Hashtable ();
+								foreach (XmlNode exc_node in srcnode.ChildNodes) {
+									if (exc_node.Name != "exclude")
+										continue;
+									string excfilename = (exc_node as XmlElement).InnerXml;
+									Console.Write (excfilename + " ");
+									excs [excfilename] = 1;
+								}
+								DirectoryInfo dinfo = new DirectoryInfo (dir_path);
+								foreach (FileInfo file in dinfo.GetFiles ("*.c")) {
+									if (excs.Contains (file.Name))
+										continue;
+									files.Add (dir_path + Path.DirectorySeparatorChar + file.Name);
+								}
+								foreach (FileInfo file in dinfo.GetFiles ("*.h")) {
+									if (excs.Contains (file.Name))
+										continue;
+									files.Add (dir_path + Path.DirectorySeparatorChar + file.Name);
+								}
+								Console.Write ("> ");
+								break;
 							default:
 								Console.WriteLine ("Invalid source: " + srcnode.Name);
 								break;
 							}
-			
 						}
 
 						Console.WriteLine ();
diff --git a/sources/gtk-sharp-sources.xml b/sources/gtk-sharp-sources.xml
index 05d477b6b..5bde845ea 100644
--- a/sources/gtk-sharp-sources.xml
+++ b/sources/gtk-sharp-sources.xml
@@ -9,18 +9,19 @@
   <api filename="../pango/pango-api.raw">
     <library name="libpango-1.0-0.dll">
       <namespace name="Pango">
-        <dir>pango-1.4.0/pango</dir>
-	<exclude>pango-1.4.0/pango/pangox-fontcache.c</exclude>
-	<exclude>pango-1.4.0/pango/pangox-fontmap.c</exclude>
-	<exclude>pango-1.4.0/pango/pangox-private.h</exclude>
-	<exclude>pango-1.4.0/pango/pangox.h</exclude>
-	<exclude>pango-1.4.0/pango/pangox.c</exclude>
-	<exclude>pango-1.4.0/pango/pangoxft.h</exclude>
-	<exclude>pango-1.4.0/pango/pangoxft-font.h</exclude>
-	<exclude>pango-1.4.0/pango/pangoxft-fontmap.h</exclude>
-	<exclude>pango-1.4.0/pango/pangoxft-private.h</exclude>
-	<exclude>pango-1.4.0/pango/pango-script-lang-table.h</exclude>
-	<exclude>pango-1.4.0/pango/pango-script-table.h</exclude>
+        <directory path="pango-1.4.0/pango">
+	  <exclude>pangox-fontcache.c</exclude>
+	  <exclude>pangox-fontmap.c</exclude>
+	  <exclude>pangox-private.h</exclude>
+	  <exclude>pangox.h</exclude>
+	  <exclude>pangox.c</exclude>
+	  <exclude>pangoxft.h</exclude>
+	  <exclude>pangoxft-font.h</exclude>
+	  <exclude>pangoxft-fontmap.h</exclude>
+	  <exclude>pangoxft-private.h</exclude>
+	  <exclude>pango-script-lang-table.h</exclude>
+	  <exclude>pango-script-table.h</exclude>
+        </directory>
       </namespace>
     </library>
   </api>
@@ -39,86 +40,88 @@
   <api filename="../gtk/gtk-api.raw">
     <library name="libgtk-win32-2.0-0.dll">
       <namespace name="Gtk">
-        <dir>gtk+-2.4.1/gtk</dir>
-        <!-- Internal stuff -->
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserdefault.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserdefault.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserentry.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserentry.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserutils.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilechooserutils.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystem.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystem.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemmodel.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemmodel.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemunix.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemunix.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemwin32.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkfilesystemwin32.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkiconcache.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkiconcache.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkiconthemeparser.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpathbar.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpathbar.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkrbtree.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkrbtree.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtksequence.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtksequence.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextbtree.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextbtree.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextsegment.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextsegment.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktexttypes.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktexttypes.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextutil.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktextutil.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkthemes.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkthemes.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktreedatalist.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktreedatalist.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkwindow-decorate.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkwindow-decorate.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkxembed.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/xembed.h</exclude>
-        <!-- Exclude all pre gtk+-2.2 deprecated widgets -->
-        <exclude>gtk+-2.4.1/gtk/gtkclist.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkclist.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkctree.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkctree.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtklist.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtklist.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtklistitem.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtklistitem.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkoldeditable.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkoldeditable.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpixmap.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpixmap.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpreview.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkpreview.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkprogress.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtkprogress.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktext.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktext.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktipsquery.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktipsquery.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktree.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktree.h</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktreeitem.c</exclude>
-        <exclude>gtk+-2.4.1/gtk/gtktreeitem.h</exclude>
+        <directory path="gtk+-2.4.1/gtk">
+          <!-- Internal stuff -->
+          <exclude>gtkfilechooserdefault.c</exclude>
+          <exclude>gtkfilechooserdefault.h</exclude>
+          <exclude>gtkfilechooserentry.c</exclude>
+          <exclude>gtkfilechooserentry.h</exclude>
+          <exclude>gtkfilechooserutils.c</exclude>
+          <exclude>gtkfilechooserutils.h</exclude>
+          <exclude>gtkfilesystem.c</exclude>
+          <exclude>gtkfilesystem.h</exclude>
+          <exclude>gtkfilesystemmodel.c</exclude>
+          <exclude>gtkfilesystemmodel.h</exclude>
+          <exclude>gtkfilesystemunix.c</exclude>
+          <exclude>gtkfilesystemunix.h</exclude>
+          <exclude>gtkfilesystemwin32.c</exclude>
+          <exclude>gtkfilesystemwin32.h</exclude>
+          <exclude>gtkiconcache.c</exclude>
+          <exclude>gtkiconcache.h</exclude>
+          <exclude>gtkiconthemeparser.h</exclude>
+          <exclude>gtkpathbar.c</exclude>
+          <exclude>gtkpathbar.h</exclude>
+          <exclude>gtkrbtree.c</exclude>
+          <exclude>gtkrbtree.h</exclude>
+          <exclude>gtksequence.c</exclude>
+          <exclude>gtksequence.h</exclude>
+          <exclude>gtktextbtree.c</exclude>
+          <exclude>gtktextbtree.h</exclude>
+          <exclude>gtktextsegment.c</exclude>
+          <exclude>gtktextsegment.h</exclude>
+          <exclude>gtktexttypes.c</exclude>
+          <exclude>gtktexttypes.h</exclude>
+          <exclude>gtktextutil.c</exclude>
+          <exclude>gtktextutil.h</exclude>
+          <exclude>gtkthemes.c</exclude>
+          <exclude>gtkthemes.h</exclude>
+          <exclude>gtktreedatalist.c</exclude>
+          <exclude>gtktreedatalist.h</exclude>
+          <exclude>gtkwindow-decorate.c</exclude>
+          <exclude>gtkwindow-decorate.h</exclude>
+          <exclude>gtkxembed.h</exclude>
+          <exclude>xembed.h</exclude>
+          <!-- Exclude all pre gtk+-2.2 deprecated widgets -->
+          <exclude>gtkclist.c</exclude>
+          <exclude>gtkclist.h</exclude>
+          <exclude>gtkctree.c</exclude>
+          <exclude>gtkctree.h</exclude>
+          <exclude>gtklist.c</exclude>
+          <exclude>gtklist.h</exclude>
+          <exclude>gtklistitem.c</exclude>
+          <exclude>gtklistitem.h</exclude>
+          <exclude>gtkoldeditable.c</exclude>
+          <exclude>gtkoldeditable.h</exclude>
+          <exclude>gtkpixmap.c</exclude>
+          <exclude>gtkpixmap.h</exclude>
+          <exclude>gtkpreview.c</exclude>
+          <exclude>gtkpreview.h</exclude>
+          <exclude>gtkprogress.c</exclude>
+          <exclude>gtkprogress.h</exclude>
+          <exclude>gtktext.c</exclude>
+          <exclude>gtktext.h</exclude>
+          <exclude>gtktipsquery.c</exclude>
+          <exclude>gtktipsquery.h</exclude>
+          <exclude>gtktree.c</exclude>
+          <exclude>gtktree.h</exclude>
+          <exclude>gtktreeitem.c</exclude>
+          <exclude>gtktreeitem.h</exclude>
+        </directory>
       </namespace>
     </library>
   </api>
   <api filename="../gnomevfs/gnome-vfs-api.raw">
     <library name="gnomevfs-2">
       <namespace name="Gnome.Vfs">
-        <dir>gnome-vfs-2.6.0/libgnomevfs</dir>
-        <!-- These files break the parser -->
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/GNOME_VFS_Daemon-common.c</exclude>
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/GNOME_VFS_Daemon.h</exclude>
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/GNOME_VFS_Daemon-skels.c</exclude>
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/GNOME_VFS_Daemon-stubs.c</exclude>
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/gnome-vfs-job.c</exclude>
-        <exclude>gnome-vfs-2.6.0/libgnomevfs/gnome-vfs-job.h</exclude>
+        <directory path="gnome-vfs-2.6.0/libgnomevfs">
+          <!-- These files break the parser -->
+          <exclude>GNOME_VFS_Daemon-common.c</exclude>
+          <exclude>GNOME_VFS_Daemon.h</exclude>
+          <exclude>GNOME_VFS_Daemon-skels.c</exclude>
+          <exclude>GNOME_VFS_Daemon-stubs.c</exclude>
+          <exclude>gnome-vfs-job.c</exclude>
+          <exclude>gnome-vfs-job.h</exclude>
+        </directory>
       </namespace>
     </library>
   </api>