Index: modulesets/gnome-suites-2.24.modules
===================================================================
--- modulesets/gnome-suites-2.24.modules	(revision 1974)
+++ modulesets/gnome-suites-2.24.modules	(working copy)
@@ -795,6 +795,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
+      <dep package="pyxml"/>
     </dependencies>
   </autotools>
 
@@ -805,6 +806,7 @@
       <dep package="gnome-vfs"/>
       <dep package="gtk+"/>
       <dep package="liboil"/>
+      <dep package="pyxml"/>
     </dependencies>
   </autotools>
 
Index: modulesets/bootstrap.modules
===================================================================
--- modulesets/bootstrap.modules	(revision 1974)
+++ modulesets/bootstrap.modules	(working copy)
@@ -68,6 +68,7 @@
 	    module="2.4.5/Python-2.4.5.tar.bz2" version="2.4.5"
 	    size="8159705" md5sum="aade3958cb097cc1c69ae0074297d359">
       <patch file="python-2.4.4-lib64.patch" strip="1" />
+      <patch file="python-2.4.5-fix-pyconfig-path.patch" strip="1" />
     </branch>
   </autotools>
 
Index: modulesets/gnome-2.24.modules
===================================================================
--- modulesets/gnome-2.24.modules	(revision 1974)
+++ modulesets/gnome-2.24.modules	(working copy)
@@ -619,7 +619,6 @@
       <dep package="memprof"/>
       <dep package="gconf-editor"/>
       <dep package="devhelp"/>
-      <dep package="nautilus-vcs"/>
     </dependencies>
   </metamodule>
 
Index: modulesets/gnome-external-deps-2.24.modules
===================================================================
--- modulesets/gnome-external-deps-2.24.modules	(revision 1974)
+++ modulesets/gnome-external-deps-2.24.modules	(working copy)
@@ -55,6 +55,9 @@
       <dep package="dbus"/>
       <dep package="glib"/>
     </dependencies>
+    <patches>
+      <patch file="dbus-binding-tool-ignore-namespaced-nodes.patch" strip="1"/>
+    </patches>
   </tarball>
 
   <repository type="tarball" name="dbus/dbus-python"
@@ -89,6 +92,9 @@
   <tarball id="fontconfig" version="2.5.0">
     <source href="http://www.fontconfig.org/release/fontconfig-2.5.0.tar.gz"
             md5sum="21d14af8ecf645ef76211c782cdd7aeb" size="1385058"/>
+    <dependencies>
+      <dep package="libxml2"/>
+    </dependencies>
   </tarball>
 
   <tarball id="gamin" version="0.1.8">
@@ -132,6 +138,9 @@
   <tarball id="iso-codes" version="0.53">
     <source href="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-0.53.tar.bz2"
             md5sum="652887a62d8024e4ab6933061a92c233" size="4411143"/>
+    <dependencies>
+      <dep package="pyxml"/>
+    </dependencies>
   </tarball>
 
   <tarball id="libcolorblind" version="0.0.1">
@@ -318,19 +327,24 @@
       <dep package="perl-net-dbus"/>
       <dep package="intltool"/>
     </suggests>
+    <patches>
+      <patch file="system-tools-backends-open-create-args.patch" strip="1"/>
+    </patches>
   </tarball>
 
   <repository type="tarball" name="mozilla.org"
       href="http://releases.mozilla.org/pub/mozilla.org/"/>
   <autotools id="mozilla"
              autogen-sh="configure"
-             autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser --disable-javaxpcom --enable-application=browser --enable-extensions=default,cookie,permissions --with-default-mozilla-five-home=${libdir}/firefox-2.0"
+             autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --enable-system-cairo --disable-freetype2 --enable-application=browser --disable-javaxpcom --enable-application=browser --enable-extensions=default,cookie,permissions --with-default-mozilla-five-home=${libdir}/firefox-2.0"
              makeinstallargs="install; mkdir ${prefix}/include/firefox-2.0/nss/; find security/nss/lib/ -name '*.h' -type f -exec /bin/cp {} ${prefix}/include/firefox-2.0/nss/ \;">
     <branch repo="mozilla.org"
             module="firefox/releases/2.0/source/firefox-2.0-source.tar.bz2"
             version="2.0"
             size="36922776" md5sum="03709c15cba0e0375ff5336d538f77e7"
-            checkoutdir="mozilla" />
+            checkoutdir="mozilla">
+      <patch file="firefox-2.0-link-layout.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
@@ -389,6 +403,14 @@
             size="931015" md5sum="b65d4b9e3ddbcfd5418b708858c05b66"/>
   </tarball>
 
+  <repository type="tarball" name="pyxml"
+              href="http://kent.dl.sourceforge.net/sourceforge/pyxml/"/>
+  <distutils id="pyxml">
+    <branch module="PyXML-0.8.4.tar.gz" version="0.8.4"
+            repo="pyxml"
+	    md5sum="1f7655050cebbb664db976405fdba209" size="734954"/>
+  </distutils>
+
   <!-- Mono Binding -->
 
   <tarball id="libgdiplus" version="1.2.6" >
@@ -415,6 +437,9 @@
     <dependencies>
       <dep package="mono"/>
     </dependencies>
+    <patches>
+      <patch file="monodoc-cs-errors-path.patch" strip="1"/>
+    </patches>
   </tarball>
  
 </moduleset>