diff --git a/package/gnome2/anjuta/anjuta.conf b/package/gnome2/anjuta/anjuta.conf
index bd1acccdd..d75e259a9 100644
--- a/package/gnome2/anjuta/anjuta.conf
+++ b/package/gnome2/anjuta/anjuta.conf
@@ -30,3 +30,6 @@ var_append extraconfopt " " "--with-subversion-dir=/$apacheprefix"
 var_append extraconfopt " " "--with-apr-config=apr-1-config"
 var_append extraconfopt " " "--with-apu-config=apu-1-config"
 
+# This prevents file conflicts due to updated mime database files.
+echo -e '#!/bin/sh\ntrue' > $CMD_WRAPPER_MYPATH/update-mime-database
+chmod +x $CMD_WRAPPER_MYPATH/update-mime-database
diff --git a/package/gnome2/anjuta/fix-linkage.patch b/package/gnome2/anjuta/fix-linkage.patch
deleted file mode 100644
index 0842a8a9a..000000000
--- a/package/gnome2/anjuta/fix-linkage.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- anjuta-2.0.2/libegg/Makefile.in	2006-05-15 21:44:32.000000000 +0200
-+++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/libegg/Makefile.in	2006-10-24 16:45:08.000000000 +0200
-@@ -428,16 +428,16 @@
- 	$(GCONF_LIBS)
- 
- test_tree_utils_SOURCES = test-tree-utils.c
--test_tree_utils_LDADD = libanjuta-egg.la
-+test_tree_utils_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD)
- test_tree_utils_DEPENDENCIES = libanjuta-egg.la
- test_multi_drag_SOURCES = test-multi-drag.c
--test_multi_drag_LDADD = libanjuta-egg.la
-+test_multi_drag_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD)
- test_multi_drag_DEPENDENCIES = libanjuta-egg.la
- test_union_SOURCES = test-union.c
--test_union_LDADD = libanjuta-egg.la
-+test_union_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD)
- test_union_DEPENDENCIES = libanjuta-egg.la
- test_actions_SOURCES = test-actions.c
--test_actions_LDADD = libanjuta-egg.la
-+test_actions_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD)
- test_actions_DEPENDENCIES = libanjuta-egg.la
- EXTRA_DIST = \
- 	eggmarshalers.list \
---- anjuta-2.0.2/manuals/reference/libanjuta/Makefile.in	2006-05-15 21:44:33.000000000 +0200
-+++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/manuals/reference/libanjuta/Makefile.in	2006-10-24 17:57:49.000000000 +0200
-@@ -399,13 +399,17 @@
- @HAVE_PLUGIN_SCINTILLA_TRUE@	-I$(top_builddir) 				\
- @HAVE_PLUGIN_SCINTILLA_TRUE@	-I$(top_builddir)/libanjuta			\
- @HAVE_PLUGIN_SCINTILLA_TRUE@	-I$(top_builddir)/scintilla/include		\
--@HAVE_PLUGIN_SCINTILLA_TRUE@	$(LIBANJUTA_CFLAGS)
-+@HAVE_PLUGIN_SCINTILLA_TRUE@	$(LIBANJUTA_LIBS) \
-+@HAVE_PLUGIN_SCINTILLA_TRUE@	$(GNOME_UI_LIBS) \
-+@HAVE_PLUGIN_SCINTILLA_TRUE@	$(GLADE_LIBS)
- 
- @HAVE_PLUGIN_SCINTILLA_FALSE@GTKDOC_LIBS = \
- @HAVE_PLUGIN_SCINTILLA_FALSE@	-lutil \
- @HAVE_PLUGIN_SCINTILLA_FALSE@	$(top_builddir)/libanjuta/libanjuta.la \
- @HAVE_PLUGIN_SCINTILLA_FALSE@	$(top_builddir)/libanjuta/interfaces/libanjuta-interfaces.la \
--@HAVE_PLUGIN_SCINTILLA_FALSE@	$(LIBANJUTA_LIBS)
-+@HAVE_PLUGIN_SCINTILLA_FALSE@	$(LIBANJUTA_LIBS) \
-+@HAVE_PLUGIN_SCINTILLA_FALSE@	$(GNOME_UI_LIBS) \
-+@HAVE_PLUGIN_SCINTILLA_FALSE@	$(GLADE_LIBS)
- 
- @HAVE_PLUGIN_SCINTILLA_TRUE@GTKDOC_LIBS = \
- @HAVE_PLUGIN_SCINTILLA_TRUE@	-lutil \
---- anjuta-2.0.2/plugins/gdb/Makefile.in	2006-05-15 21:44:37.000000000 +0200
-+++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/plugins/gdb/Makefile.in	2006-10-24 17:26:54.000000000 +0200
-@@ -38,7 +38,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = gdbmi-test$(EXEEXT)
-+noinst_PROGRAMS =
- subdir = plugins/gdb
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
---- anjuta-2.0.2/src/Makefile.in	2006-05-15 21:44:49.000000000 +0200
-+++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/src/Makefile.in	2006-10-24 17:45:06.000000000 +0200
-@@ -518,6 +518,8 @@
- 
- anjuta_shell_SOURCES = shell.c shell.h
- anjuta_shell_LDADD = \
-+	$(GNOME_UI_LIBS) \
-+	$(GDL_LIBS) \
- 	$(top_builddir)/libanjuta/libanjuta.la
- 
- EXTRA_DIST = \
diff --git a/package/gnome2/control-center/control-center.conf b/package/gnome2/control-center/control-center.conf
index 9bf2a3c00..5ac75c202 100644
--- a/package/gnome2/control-center/control-center.conf
+++ b/package/gnome2/control-center/control-center.conf
@@ -22,4 +22,5 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
-
+# scrollkeeper is required by make in the help/ sub-directory.
+var_append extraconfopt ' ' '--enable-scrollkeeper'
diff --git a/package/gnome2/dia/dia.conf b/package/gnome2/dia/dia.conf
index 6702863ef..f06c4e26a 100644
--- a/package/gnome2/dia/dia.conf
+++ b/package/gnome2/dia/dia.conf
@@ -24,3 +24,5 @@
 
 var_append confopt ' ' "--with-python"
 var_append confopt ' ' "--enable-gnome"
+
+pkginstalled docbookx && var_append makeopt ' ' 'DB2MAN=$datadir/xml/docbook/xsl-stylesheets/xhtml/docbook.xsl'
diff --git a/package/gnome2/ekiga/ekiga.conf b/package/gnome2/ekiga/ekiga.conf
index 7487817ba..d9dde1516 100644
--- a/package/gnome2/ekiga/ekiga.conf
+++ b/package/gnome2/ekiga/ekiga.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -28,13 +29,22 @@
 #  --enable-ipv6     enable IPv6 experimental support
 #  --disable-install-schemas        Disable installation of the gconf schemas
 
+pkginstalled dbus && var_append extraconfopt ' ' '--enable-dbus'
+
 pkginstalled openldap && \
-        var_append confopt " " "--with-ldap-dir=${pkg_openldap_prefix}"
+        var_append extraconfopt " " "--with-ldap-dir=${pkg_openldap_prefix}"
 
 # no howl yet
-var_append confopt ' ' "--disable-howl"
+var_append extraconfopt ' ' "--disable-howl"
 
 var_append configprefix ' ' 'LDFLAGS="-Wl,-rpath -Wl,$root/$prefix/lib -L${pkg_openldap_prefix}/lib -lldap"'
 
 pkginstalled openldap && \
     var_append makeopt ' ' 'CFLAGS="-I${pkg_openldap_prefix}/include"'
+
+# libnss and others are required
+if pkginstalled firefox ; then
+	var_append makeopt " " "-Wl,--rpath-link -Wl,`firefox-config --libs | sed -e"s,-L,,"`"
+else
+	var_append makeopt " " "-Wl,--rpath-link -Wl,`firefox-config --libs | sed -e"s,-L,,"`"
+fi
diff --git a/package/gnome2/evolution-webcal/evolution-webcal.conf b/package/gnome2/evolution-webcal/evolution-webcal.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/evolution-webcal/evolution-webcal.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf
diff --git a/package/gnome2/gconf-editor/gconf-editor.conf b/package/gnome2/gconf-editor/gconf-editor.conf
index e78b38952..791d3415d 100644
--- a/package/gnome2/gconf-editor/gconf-editor.conf
+++ b/package/gnome2/gconf-editor/gconf-editor.conf
@@ -23,3 +23,5 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+# File conflict with gnome2-dirtree.
+var_append flist''del '|' '.*/share/icons/hicolor'
diff --git a/package/gnome2/gconf/postinstall.sh b/package/gnome2/gconf/postinstall.sh
new file mode 100644
index 000000000..5f6e95105
--- /dev/null
+++ b/package/gnome2/gconf/postinstall.sh
@@ -0,0 +1,10 @@
+if [ "$install_checks_true" = 1 ] ; then
+	gconftool-2 --install-schema-file D_sysconfdir/gconf/schemas/*
+else
+	dir="D_sysconfdir"; dir=${dir#/}
+	all_touched "$dir/gconf/schemas/.*\.schemas" |
+	while read x ; do
+		gconftool-2 --install-schema-file "/$x"
+	done
+	unset dir x
+fi
diff --git a/package/gnome2/gdm/libwrap-externals.patch b/package/gnome2/gdm/libwrap-externals.patch
new file mode 100644
index 000000000..ad65c7f82
--- /dev/null
+++ b/package/gnome2/gdm/libwrap-externals.patch
@@ -0,0 +1,16 @@
+--- ./daemon/gdm-xdmcp-manager.c~	2007-11-08 20:42:21.000000000 +0000
++++ ./daemon/gdm-xdmcp-manager.c	2007-11-08 20:43:00.000000000 +0000
+@@ -63,11 +63,11 @@
+  * On Sun, we need to define allow_severity and deny_severity to link
+  * against libwrap.
+  */
+-#ifdef __sun
++// #ifdef __sun
+ #include <syslog.h>
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;
+-#endif
++// #endif
+ 
+ #define GDM_XDMCP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_XDMCP_MANAGER, GdmXdmcpManagerPrivate))
+ 
diff --git a/package/gnome2/gedit/gedit.conf b/package/gnome2/gedit/gedit.conf
index 1f065ec0c..ac30c0974 100644
--- a/package/gnome2/gedit/gedit.conf
+++ b/package/gnome2/gedit/gedit.conf
@@ -23,3 +23,4 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+pkginstalled iso-codes || var_append extraconfopt ' ' '--disable-spell'
diff --git a/package/gnome2/glademm/gcc4.patch b/package/gnome2/glademm/gcc4.patch
new file mode 100644
index 000000000..cc58a59d5
--- /dev/null
+++ b/package/gnome2/glademm/gcc4.patch
@@ -0,0 +1,11 @@
+--- ./src/writers/gnome_app.hh~	2002-04-02 15:14:58.000000000 +0000
++++ ./src/writers/gnome_app.hh	2007-11-10 21:16:59.000000000 +0000
+@@ -28,7 +28,7 @@
+ 	virtual bool NeedExplicitCtor(const Widget &w) const;
+ 	virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
+ 	virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
+-	virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget &ch) const;
++	virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
+ 	virtual const std::string InternalInstance(const Widget &parent,const Widget &w2) const;
+ 	virtual void AddChildren(const Widget &w,CxxFile &f,const std::string &instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw) const;
+ };
diff --git a/package/gnome2/gmime/gmime.conf b/package/gnome2/gmime/gmime.conf
index 8f349bf95..da96a99a5 100644
--- a/package/gnome2/gmime/gmime.conf
+++ b/package/gnome2/gmime/gmime.conf
@@ -22,3 +22,5 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+# Fixes file conflict with sharutils
+var_append INSTALL_WRAPPER_FILTER '|' 'sed -e "s,bin/\(uu\(de\|en\)code\),bin/gmime-\1,"'
diff --git a/package/gnome2/gnome-games/gnome-games.conf b/package/gnome2/gnome-games/gnome-games.conf
index 4a7a6195d..c373c71c4 100644
--- a/package/gnome2/gnome-games/gnome-games.conf
+++ b/package/gnome2/gnome-games/gnome-games.conf
@@ -26,3 +26,5 @@
 var_append confopt ' ' "--with-scores-group=games"
 #@FIXME: var_append confopt ' ' "--with-scores-user=bin"
 var_append confopt ' ' "--with-scores-user=bin"
+
+pkginstalled guile || var_append ' ' '--enable-omitgames=aisleriot'
diff --git a/package/gnome2/gnome-nettool/gnome-nettool.conf b/package/gnome2/gnome-nettool/gnome-nettool.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/gnome-nettool/gnome-nettool.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf
diff --git a/package/gnome2/gossip/gossip.conf b/package/gnome2/gossip/gossip.conf
index d492adbd5..b40155c26 100644
--- a/package/gnome2/gossip/gossip.conf
+++ b/package/gnome2/gossip/gossip.conf
@@ -22,3 +22,7 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+# Without this gossip would try to use lm_debug_init from the
+# loudmouth library, which would only exist if loudmouth were
+# compiled with --enable-debug.
+var_append makeopt ' ' 'CFLAGS="$CFLAGS -DLM_NO_DEBUG"'
\ No newline at end of file
diff --git a/package/gnome2/hicolor-icon-theme/hicolor-icon-theme.conf b/package/gnome2/hicolor-icon-theme/hicolor-icon-theme.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/hicolor-icon-theme/hicolor-icon-theme.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf
diff --git a/package/gnome2/librsvg/missing-requires-in-pc.patch b/package/gnome2/librsvg/missing-requires-in-pc.patch
deleted file mode 100644
index a4d883214..000000000
--- a/package/gnome2/librsvg/missing-requires-in-pc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/gnome2/librsvg/missing-requires-in-pc.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./librsvg-2.0.pc.in.orig	2004-12-04 19:39:28.818414896 +0100
-+++ ./librsvg-2.0.pc.in	2004-12-04 19:44:15.204877536 +0100
-@@ -6,6 +6,6 @@
- Name: librsvg
- Description: library that renders svg files
- Version: @VERSION@
--Requires: glib-2.0 gdk-pixbuf-2.0
-+Requires: glib-2.0 gdk-pixbuf-2.0 libgsf-1 libcroco-0.6 gnome-vfs-2.0
- Libs: -L${libdir} -lrsvg-2
- Cflags: -I${includedir}/librsvg-2
diff --git a/package/gnome2/libwnck/pc-file-need-startupnotif.patch b/package/gnome2/libwnck/pc-file-need-startupnotif.patch
deleted file mode 100644
index 7ae73bbbd..000000000
--- a/package/gnome2/libwnck/pc-file-need-startupnotif.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/gnome2/libwnck/pc-file-need-startupnotif.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./libwnck-1.0.pc.in.orig	2004-12-04 22:46:08.542797992 +0100
-+++ ./libwnck-1.0.pc.in	2004-12-04 22:46:40.737903592 +0100
-@@ -6,7 +6,7 @@
- Name: libwnck
- Description: Window Navigator Construction Kit library
- Version: @VERSION@
--Requires: gtk+-2.0
-+Requires: gtk+-2.0 libstartup-notification-1.0
- Libs: -L${libdir} -lwnck-1
- Cflags: -I${includedir}/libwnck-1.0
- 
diff --git a/package/gnome2/loudmouth/loudmouth.conf b/package/gnome2/loudmouth/loudmouth.conf
index de3704d94..9a8569265 100644
--- a/package/gnome2/loudmouth/loudmouth.conf
+++ b/package/gnome2/loudmouth/loudmouth.conf
@@ -22,3 +22,10 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+if ! pkginstalled gnutls ; then
+	if pkginstalled openssl ; then
+		var_append extraconfopt ' ' '--with-ssl=openssl'
+	else
+		var_append extraconfopt ' ' '--with-ssl=no'
+	fi
+fi
diff --git a/package/gnome2/metatheme/constant-initializer.patch b/package/gnome2/metatheme/constant-initializer.patch
new file mode 100644
index 000000000..ad739efb7
--- /dev/null
+++ b/package/gnome2/metatheme/constant-initializer.patch
@@ -0,0 +1,16 @@
+--- metatheme-0.9.7/plugins/background/bg-ext-handler.c~	2002-04-18 21:42:44.000000000 +0200
++++ metatheme-0.9.7/plugins/background/bg-ext-handler.c	2007-11-08 11:55:35.000000000 +0100
+@@ -200,7 +200,12 @@
+ 	int i = 0;
+ 	gchar *key, *val;
+ 	static gchar* args[] = {"Color1", "Color2", "ColorGradient", "GradientType", "WallpaperLayout", NULL};
+-	static gchar* descs[] = {_("Primary Color"), _("Secondary Color"), _("Use Gradient"), _("Gradient Type"), _("Wallpaper Layout Type"), NULL};
++	static gchar* descs[] = { NULL, NULL, NULL, NULL, NULL, NULL };
++	if (descs[0] == NULL) descs[0] = _("Primary Color");
++	if (descs[1] == NULL) descs[1] = _("Secondary Color");
++	if (descs[2] == NULL) descs[2] = _("Use Gradient");
++	if (descs[3] == NULL) descs[3] = _("Gradient Type");
++	if (descs[4] == NULL) descs[4] = _("Wallpaper Layout Type");
+ 
+ 	MTM_EXT_HANDLER (handler)->describe_arg = bg_ext_handler_describe_arg;
+ 
diff --git a/package/gnome2/sabayon/sabayon.conf b/package/gnome2/sabayon/sabayon.conf
index 6dee92a44..a73404f6c 100644
--- a/package/gnome2/sabayon/sabayon.conf
+++ b/package/gnome2/sabayon/sabayon.conf
@@ -22,3 +22,6 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+# This sets some installation paths and must be given.
+var_append extraconfopt ' ' '--with-distro=debian'
+
diff --git a/package/gnome2/seahorse/seahorse.conf b/package/gnome2/seahorse/seahorse.conf
index aa13a47c6..02752ff2b 100644
--- a/package/gnome2/seahorse/seahorse.conf
+++ b/package/gnome2/seahorse/seahorse.conf
@@ -22,10 +22,5 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
-# for some reason or another we touch this files here. However, they aren't
-# really modified, so we can simple tell the flist wrapper to ignore them..
-var_append flist''del "|" ".*/x-gdesklets-display.xml"
-var_append flist''del "|" ".*/x-glabels.xml"
-
-var_append extraconfopt " " "--disable-gpg-check"
-
+# This prevents file conflicts due to touched files in /usr/share/mime/.
+var_append extraconfopt ' ' '--disable-update-mime-database'
diff --git a/package/gnome2/sensors-applet/sensors-applet.conf b/package/gnome2/sensors-applet/sensors-applet.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/sensors-applet/sensors-applet.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf
diff --git a/package/gnome2/system-tools-backends/system-tools-backends.conf b/package/gnome2/system-tools-backends/system-tools-backends.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/system-tools-backends/system-tools-backends.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf
diff --git a/package/gnome2/totem/totem.conf b/package/gnome2/totem/totem.conf
index 6dee92a44..d43427a41 100644
--- a/package/gnome2/totem/totem.conf
+++ b/package/gnome2/totem/totem.conf
@@ -22,3 +22,7 @@
 
 .  $base/package/gnome2/gnome-2.conf
 
+if pkginstalled startup-notification ; then
+	# This helps totem find startup-notification header and library files.
+	var_append makeopt ' ' 'CFLAGS="$CFLAGS -I$includedir/startup-notification-1.0 -lstartup-notification-1 -L$libdir"'
+fi
diff --git a/package/gnome2/update-gnome.sh b/package/gnome2/update-gnome.sh
index ee9551696..76377903c 100644
--- a/package/gnome2/update-gnome.sh
+++ b/package/gnome2/update-gnome.sh
@@ -18,13 +18,27 @@ major="${ver%.*}"
 rev="${ver##*.}"
 
 baseurl="http://ftp.gnome.org/pub/GNOME"
-urlplatform="$baseurl/platform/$major/$major.$rev/sources/"
-urldesktop="$baseurl/desktop/$major/$major.$rev/sources/"
+urladmin="$baseurl/admin/$major/$major.$rev/sources/"
 urlbindings="$baseurl/bindings/$major/$major.$rev/sources"
 urlbindings="$urlbindings/c++/ $urlbindings/java/ $urlbindings/mono/ $urlbindings/python/"
-urladmin="$baseurl/admin/$major/$major.$rev/sources/"
+urldesktop="$baseurl/desktop/$major/$major.$rev/sources/"
+urldevtools="$baseurl/devtools/$major/$major.$rev/sources/"
+urlplatform="$baseurl/platform/$major/$major.$rev/sources/"
 
-for url in $urlplatform $urldesktop $urlbindings $urladmin; do
+create_pkg() {
+	echo "$pkg ($pkgver) is not a rock package yet"
+	echo "creating $pkg package"
+	bash misc/archive/newpackage.sh package/gnome2/$pkg $url$newver.tar.bz2
+	sed -i package/gnome2/$pkg/$pkg.desc \
+	-e "s,^\(\[C\]\).*,\1 extra/desktop/gnome," \
+	-e "s,^\(\[V\]\).*,\1 $pkgver," \
+	-e "s,^\(\[S\]\).*,\1 Stable," \
+	-e "s,^\(\[A\]\).*,\1 The GNOME Project," \
+	-e "s,^\(\[M\]\).*,\1 The ROCK Linux Project," \
+	-e "s,^\(\[U\]\).*,\1 http://www.gnome.org,"
+}
+
+for url in $urladmin $urlbindings $urldesktop $urldevtools $urlplatform ; do
 	wget -q -O - $url | \
 	sed -n '/id="body"/,/\/div/{/tar.bz2/p}' | \
 	sed -r 's/^.*href="([^"]*).tar.bz2".*$/\1/' | \
@@ -40,10 +54,8 @@ for url in $urlplatform $urldesktop $urlbindings $urladmin; do
 				./scripts/Create-PkgUpdPatch $pkg-$pkgver | \
 				patch -p0
 			fi
-		else
-			echo "$pkg is not a rock package yet"
-# 			echo "creating $pkg package"
-# 			bash misc/archive/newpackage.sh package/gnome2/$pkg $url$newver.tar.bz2
+# 		else
+# 			create_pkg
 		fi
 		if [ -e package/*/$pkg/$pkg.desc -a $dry = 0 ] ; then
 			sed -i -e "s,^\(\[D\] .*$newver.* \)http://.*,\1$url,g" package/*/$pkg/$pkg.desc
@@ -76,10 +88,8 @@ while IFS=":" read pkg download; do
 					./scripts/Create-PkgUpdPatch $pkg-$pkgver | \
 					patch -p0
 				fi
-			else
-				echo "$pkg is not a rock package yet"
-# 				echo "creating $pkg package"
-# 				bash misc/archive/newpackage.sh package/gnome2/$pkg $url$newver.tar.bz2
+# 			else
+# 				create_pkg
 			fi
 			if [ -e package/*/$pkg/$pkg.desc -a $dry = 0 ] ; then
 				sed -i -e "s,^\(\[D\] .*$pkgver.* \)http://.*,\1$url,g" package/*/$pkg/$pkg.desc
diff --git a/package/gnome2/vino/vino.conf b/package/gnome2/vino/vino.conf
new file mode 100644
index 000000000..572eed78b
--- /dev/null
+++ b/package/gnome2/vino/vino.conf
@@ -0,0 +1 @@
+. $base/package/gnome2/gnome-2.conf