diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 902e3d494ae5..0c330c161f37 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -4,7 +4,7 @@
 , flex, bison, popt, perl, zlib, libxml2, libxslt
 , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
 , libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses
-, which, libxml2Python
+, which, libxml2Python, iconnamingutils
 }:
 
 assert dbus_glib.glib == gtkLibs.glib;
@@ -141,7 +141,8 @@ rec {
   libgtkhtml = gtkhtml;
 
   gnomeicontheme = import ./gnome-icon-theme.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser
+      iconnamingutils gettext;
     input = desktop.gnomeicontheme;
   };
 
@@ -174,11 +175,16 @@ rec {
     input = desktop.libwnck;
   };
 
+  gnomemenus = import ./gnome-menus.nix {
+    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser
+      python gettext;
+    input = desktop.gnomemenus;
+  };
+
   gnomepanel = import ./gnome-panel.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2
-            libgnome libgnomeui gnomedesktop libglade libwnck
-            libjpeg libpng scrollkeeper;
-    inherit (xlibs) libXmu;
+    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser libjpeg
+      libpng dbus_glib gettext libxslt;
+    inherit (xlibs) libXmu libXau;
     input = desktop.gnomepanel;
   };
 
@@ -224,6 +230,19 @@ rec {
       gettext which python libxml2Python libxslt;
     input = desktop.gnometerminal;
   };
+
+  libgtop = import ./libgtop.nix {
+    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
+      popt gettext;
+    input = desktop.libgtop;
+  };
+  
+  gnomeutils = import ./gnome-utils.nix {
+    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
+      gettext libxslt /*  which python libxml2Python libxslt */;
+    inherit (xlibs) libXmu;
+    input = desktop.gnomeutils;
+  };
   
 };
 
diff --git a/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch b/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch
deleted file mode 100644
index 81b12cd1449f..000000000000
--- a/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gnome-icon-theme-2.14.2/Makefile.in gnome-icon-theme-2.14.2.new/Makefile.in
---- gnome-icon-theme-2.14.2/Makefile.in	2006-03-14 21:20:19.000000000 +0100
-+++ gnome-icon-theme-2.14.2.new/Makefile.in	2006-07-06 14:22:30.000000000 +0200
-@@ -198,7 +198,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = 12x12 16x16 24x24 32x32 36x36 48x48 72x72 96x96 192x192 scalable po
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gnome-icon-theme.pc
- THEME_IN_FILES = index.theme.in
- icondir = $(datadir)/icons/gnome
diff --git a/pkgs/desktops/gnome/gnome-icon-theme.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix
index e5c7d408c65e..6ee8995305de 100644
--- a/pkgs/desktops/gnome/gnome-icon-theme.nix
+++ b/pkgs/desktops/gnome/gnome-icon-theme.nix
@@ -1,13 +1,13 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
-
-assert pkgconfig != null && perl != null;
+{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser
+, iconnamingutils, gettext
+}:
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser];
+  buildInputs = [pkgconfig perl perlXMLParser iconnamingutils gettext];
 
-  # TODO: maybe this package as dependency on gnome-themes?
-  configureFlags = "--disable-hicolor-check";
-
-  patches = [./gnome-icon-theme-2.14.2.patch];
+  postInstall = "
+    ensureDir $out/lib
+    ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
+  ";  
 }
diff --git a/pkgs/desktops/gnome/gnome-menus.nix b/pkgs/desktops/gnome/gnome-menus.nix
new file mode 100644
index 000000000000..66cea23f6ca7
--- /dev/null
+++ b/pkgs/desktops/gnome/gnome-menus.nix
@@ -0,0 +1,10 @@
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, python, gettext
+}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.glib python gettext
+  ];
+}
diff --git a/pkgs/desktops/gnome/gnome-panel.nix b/pkgs/desktops/gnome/gnome-panel.nix
index 49ef9203f31a..4ae6598f5e9e 100644
--- a/pkgs/desktops/gnome/gnome-panel.nix
+++ b/pkgs/desktops/gnome/gnome-panel.nix
@@ -1,13 +1,16 @@
-{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
-, ORBit2, libgnome, libgnomeui, gnomedesktop, libglade, libwnck
-, libjpeg, libpng, scrollkeeper, libXmu
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, libjpeg, libpng, libXmu, libXau, dbus_glib, gettext, libxslt
 }:
 
 stdenv.mkDerivation {
   inherit (input) name src;
+  
   buildInputs = [
-    pkgconfig perl perlXMLParser gtk glib ORBit2 libgnome libgnomeui
-    gnomedesktop libglade libwnck libjpeg libpng scrollkeeper
-    libXmu
+    pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.ORBit2
+    gnome.libgnome gnome.libgnomeui gnome.gnomedesktop gnome.libglade
+    gnome.libwnck libjpeg libpng gnome.scrollkeeper libXmu libXau
+    dbus_glib gnome.gnomemenus gnome.gnomedocutils gettext libxslt
   ];
+
+  configureFlags = "--disable-scrollkeeper";
 }
diff --git a/pkgs/desktops/gnome/gnome-utils.nix b/pkgs/desktops/gnome/gnome-utils.nix
new file mode 100644
index 000000000000..6714212915a0
--- /dev/null
+++ b/pkgs/desktops/gnome/gnome-utils.nix
@@ -0,0 +1,23 @@
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, gettext, libxslt, libXmu
+#, which, python, libxml2Python, libxslt
+}:
+
+# !!! should get rid of libxml2Python, see gnomedocutils
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.glib gnome.gtk gnome.libgnome
+    gnome.libgnomeui gnome.libglade gnome.libgnomeprintui
+    gnome.gnomedesktop gnome.gnomepanel gnome.libgtop gnome.scrollkeeper
+    gnome.gnomedocutils gettext libxslt libXmu
+    # gnome.gtk gnome.GConf gnome.libglade
+    #gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte
+    #gnome.gnomedocutils gettext which gnome.scrollkeeper
+    #python libxml2Python libxslt
+  ];
+
+  configureFlags = "--disable-scrollkeeper";
+}
diff --git a/pkgs/desktops/gnome/libgnomeprintui.nix b/pkgs/desktops/gnome/libgnomeprintui.nix
index 34f2b7994985..e1980a0dab12 100644
--- a/pkgs/desktops/gnome/libgnomeprintui.nix
+++ b/pkgs/desktops/gnome/libgnomeprintui.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation {
   inherit (input) name src;
 
   buildInputs = [
-    perl perlXMLParser pkgconfig
-    gtk libgnomeprint libgnomecanvas gnomeicontheme
+    perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme
+  ];
+
+  propagatedBuildInputs = [
+    libgnomeprint
   ];
 }
diff --git a/pkgs/desktops/gnome/libgtop.nix b/pkgs/desktops/gnome/libgtop.nix
new file mode 100644
index 000000000000..2ab1841155e5
--- /dev/null
+++ b/pkgs/desktops/gnome/libgtop.nix
@@ -0,0 +1,11 @@
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser, popt
+, gettext
+}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.glib popt gettext
+  ];
+}
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix
deleted file mode 100644
index eb1e09040bce..000000000000
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix
+++ /dev/null
@@ -1,515 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  bugbuddy = {
-    name = "bug-buddy-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/bug-buddy-2.14.0.tar.bz2;
-      md5 = "4fb288adc8f67cbfb8886ddf7b400530";
-    };
-  };
-  controlcenter = {
-    name = "control-center-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/control-center-2.14.2.tar.bz2;
-      md5 = "08711b0f14584e7eaa9f4c275085ab36";
-    };
-  };
-  dasher = {
-    name = "dasher-4.0.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/dasher-4.0.4.tar.bz2;
-      md5 = "6ab865403d29d9d3714e85840ed89dc7";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/deskbar-applet-2.14.2.tar.bz2;
-      md5 = "382379d0c4ca4bd73f14b25d3a04b7cc";
-    };
-  };
-  eel = {
-    name = "eel-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/eel-2.14.3.tar.bz2;
-      md5 = "cdff898f9a054b35f5e3b7c0142cc2a5";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/ekiga-2.0.2.tar.bz2;
-      md5 = "d593da6ac49dce495ef4c6ada06b54b6";
-    };
-  };
-  eog = {
-    name = "eog-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/eog-2.14.3.tar.bz2;
-      md5 = "e90e4c1e314cfab04414464088098a16";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.14.2.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/epiphany-2.14.2.1.tar.bz2;
-      md5 = "872ef8d5e95cdc359f93b5ded501d98d";
-    };
-  };
-  evince = {
-    name = "evince-0.5.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/evince-0.5.2.tar.bz2;
-      md5 = "732df368435cebddd4cc8132a8a280bd";
-    };
-  };
-  evolution = {
-    name = "evolution-2.6.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/evolution-2.6.3.tar.bz2;
-      md5 = "d7db71aaff2764f03083e6ce74c8ebde";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-1.6.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/evolution-data-server-1.6.3.tar.bz2;
-      md5 = "e40343fa6a80916da3f4d1ba5d118c89";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.6.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/evolution-exchange-2.6.3.tar.bz2;
-      md5 = "c98c41db650707fb394e3a8b0cef019b";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.6.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/evolution-webcal-2.6.0.tar.bz2;
-      md5 = "c779dcfc1db419f019abfcaafd6b8e4d";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/fast-user-switch-applet-2.14.2.tar.bz2;
-      md5 = "590e51fbc9dfa7e33a337d36349cf040";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.14.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/file-roller-2.14.4.tar.bz2;
-      md5 = "e86c78b3ecc90af20cf66511f4622c5c";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.8.19";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gcalctool-5.8.19.tar.bz2;
-      md5 = "9fbf0f2552f6fd1a0fadf54a2125fef2";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gconf-editor-2.14.0.tar.bz2;
-      md5 = "eb8b979464f6e383e5a27b57ee4e8382";
-    };
-  };
-  gdm = {
-    name = "gdm-2.14.10";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gdm-2.14.10.tar.bz2;
-      md5 = "e880558dc3574f804f3abca869992a4f";
-    };
-  };
-  gedit = {
-    name = "gedit-2.14.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gedit-2.14.4.tar.bz2;
-      md5 = "189d4d9128eca1162a782744cb324aea";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-applets-2.14.3.tar.bz2;
-      md5 = "ab96f071db993461533cb740281a7373";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.14.2.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-backgrounds-2.14.2.1.tar.bz2;
-      md5 = "10480df7c2e5a08c920c5b0a2ff4f161";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-desktop-2.14.3.tar.bz2;
-      md5 = "2a8547ab0dcb10a1ad297874ae95b06b";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.6.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-doc-utils-0.6.1.tar.bz2;
-      md5 = "c706b807b15e07e58561f903c0f20c26";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-games-2.14.3.tar.bz2;
-      md5 = "20f7c2e0ee4a65d15733332f34ac3cd4";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-icon-theme-2.14.2.tar.bz2;
-      md5 = "6f1d33a297bd27e0e9f4c1a5fa956166";
-    };
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-0.4.9";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-0.4.9.tar.bz2;
-      md5 = "9a90820acf11a66e4c3dd9e163231071";
-    };
-  };
-  gnomekeyringmanager = {
-    name = "gnome-keyring-manager-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-keyring-manager-2.14.0.tar.bz2;
-      md5 = "d4e38c7b7da99885fa898917e10d8aeb";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.12.6";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mag-0.12.6.tar.bz2;
-      md5 = "c402b06408d3b40843720ae09ad74234";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-media-2.14.2.tar.bz2;
-      md5 = "16c35916f429c5ea04fb942b4072643b";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-menus-2.14.3.tar.bz2;
-      md5 = "9926e7ad14255d1a08c7e774052f8a3a";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-netstatus-2.12.0.tar.bz2;
-      md5 = "a5f23731a3bf232969e82afef8792a36";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-nettool-2.14.2.tar.bz2;
-      md5 = "0efb13f0145abe46b26a00c75473a00f";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-panel-2.14.3.tar.bz2;
-      md5 = "14ab4c3d3ff3d0c1be397b6799a8626c";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-python-desktop-2.14.0.tar.bz2;
-      md5 = "d3f9c2d213b7d486ca7bd87dd106ca69";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-screensaver-2.14.3.tar.bz2;
-      md5 = "2ed0b9322d284bb1739e037165ca94f2";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-session-2.14.3.tar.bz2;
-      md5 = "34eb4641e2791ae51acf6f1edfcf3d64";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-speech-0.4.2.tar.bz2;
-      md5 = "df06441a5b560830264c0557e3d3c376";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.14.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-monitor-2.14.5.tar.bz2;
-      md5 = "1220837542f9c1905ebf3af69a608b07";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-system-tools-2.14.0.tar.bz2;
-      md5 = "3aded3a37f4f5b4962bf253d25cebea1";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-terminal-2.14.2.tar.bz2;
-      md5 = "da80071cd707e89cedcfb476cab8b39a";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-themes-2.14.3.tar.bz2;
-      md5 = "7c07c4c01404b447f2624e8e400ee787";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-user-docs-2.14.2.tar.bz2;
-      md5 = "4f5a7114ccf9e4e31137da50b7333570";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-utils-2.14.0.tar.bz2;
-      md5 = "d1d16ff6bfc1f6ddc110d18ec4dfdbfa";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-1.5.15";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-volume-manager-1.5.15.tar.bz2;
-      md5 = "0bf3ee007c951a5d833a3c17bbe59ec6";
-    };
-  };
-  gnopernicus = {
-    name = "gnopernicus-1.1.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnopernicus-1.1.1.tar.bz2;
-      md5 = "e691c408de4ca885a3589a0b6fa297be";
-    };
-  };
-  gok = {
-    name = "gok-1.0.10";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gok-1.0.10.tar.bz2;
-      md5 = "de6cceaca780e7ad0702c4b3c0fd8d1f";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.7";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gst-plugins-base-0.10.7.tar.bz2;
-      md5 = "d66b09de993aefd22d8fc341e5f50521";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gst-plugins-good-0.10.3.tar.bz2;
-      md5 = "2b59bce477349628ee549c2ce1d80a3a";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.8";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gstreamer-0.10.8.tar.bz2;
-      md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.6.10";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtk-engines-2.6.10.tar.bz2;
-      md5 = "f3e2b14b0cff0988277ccba42e69813d";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.10.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtkhtml-3.10.3.tar.bz2;
-      md5 = "90b1807db0ef0e5d69442e1f85610ec4";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-1.6.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtksourceview-1.6.2.tar.bz2;
-      md5 = "57f4ee84f0c494fd943c7badb0a68785";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-1.6.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gucharmap-1.6.0.tar.bz2;
-      md5 = "8af03f350c988d1565922b10776bc725";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.1.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgail-gnome-1.1.3.tar.bz2;
-      md5 = "1d12c5375b3404f4f20b214b763e5225";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.12.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprint-2.12.1.tar.bz2;
-      md5 = "ea729d4968fe2169c84efb12ace5f6cc";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.12.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeprintui-2.12.1.tar.bz2;
-      md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgtop-2.14.2.tar.bz2;
-      md5 = "adcc07c6d1c115c6d275a3c9bb1f3b68";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.14.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/librsvg-2.14.4.tar.bz2;
-      md5 = "945617bb094975d7353a3852302297c1";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.96";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libsoup-2.2.96.tar.bz2;
-      md5 = "2704961ca2b9597819f21b40d4a0e0aa";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libwnck-2.14.3.tar.bz2;
-      md5 = "5796c0c26c5dfbad6d4fdf77858feae6";
-    };
-  };
-  libxklavier = {
-    name = "libxklavier-2.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libxklavier-2.2.tar.bz2;
-      md5 = "1c53646f35d77564f42d3f4342cd443f";
-    };
-  };
-  metacity = {
-    name = "metacity-2.14.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/metacity-2.14.5.tar.bz2;
-      md5 = "a14c4a07e456a2590452d6c9db2e5153";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-2.14.3.tar.bz2;
-      md5 = "e82df2a1cb11719d054959539b74b3c7";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/nautilus-cd-burner-2.14.3.tar.bz2;
-      md5 = "c85642630b3db5ee0a40e2fdbf4fdf94";
-    };
-  };
-  scrollkeeper = {
-    name = "scrollkeeper-0.3.14";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/scrollkeeper-0.3.14.tar.bz2;
-      md5 = "b175e582a6cec3e50a9de73a5bb7455a";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.14.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/sound-juicer-2.14.5.tar.bz2;
-      md5 = "2bb23f1bd7751eb9f14f2446beed15e0";
-    };
-  };
-  startupnotification = {
-    name = "startup-notification-0.8";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/startup-notification-0.8.tar.bz2;
-      md5 = "d9b2e9fba18843314ae42334ceb4336d";
-    };
-  };
-  systemtoolsbackends = {
-    name = "system-tools-backends-1.4.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/system-tools-backends-1.4.2.tar.bz2;
-      md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
-    };
-  };
-  totem = {
-    name = "totem-1.4.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/totem-1.4.3.tar.bz2;
-      md5 = "971f99d769cb865f9a6b55284357f415";
-    };
-  };
-  vino = {
-    name = "vino-2.13.5";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/vino-2.13.5.tar.bz2;
-      md5 = "9bc8c3f0e639fdc7b9ed023501308359";
-    };
-  };
-  vte = {
-    name = "vte-0.12.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/vte-0.12.2.tar.bz2;
-      md5 = "7cb1bd6ca528bc4db5ec685549fd3eb1";
-    };
-  };
-  yelp = {
-    name = "yelp-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/yelp-2.14.3.tar.bz2;
-      md5 = "d3c4300c9a7d38ff2179b934ca5e2d1a";
-    };
-  };
-  zenity = {
-    name = "zenity-2.14.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/zenity-2.14.3.tar.bz2;
-      md5 = "00c0930abb905a5552f67ee764bd6177";
-    };
-  };
-}
diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix
deleted file mode 100644
index c6f90204fc94..000000000000
--- a/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.11.4";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/atk-1.11.4.tar.bz2;
-      md5 = "2f7132e46a62a2586545bca40eeeef39";
-    };
-  };
-  atspi = {
-    name = "at-spi-1.7.7";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/at-spi-1.7.7.tar.bz2;
-      md5 = "2988cd21d9f292fd404a8c532fe2723d";
-    };
-  };
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.36";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/esound-0.2.36.tar.bz2;
-      md5 = "3facb5aa0115cc1c31771b9ad454ae76";
-    };
-  };
-  gail = {
-    name = "gail-1.8.11";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gail-1.8.11.tar.bz2;
-      md5 = "ff79df7dd0cf7a5109c089b9b5fbe17f";
-    };
-  };
-  GConf = {
-    name = "GConf-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/GConf-2.14.0.tar.bz2;
-      md5 = "d07c2efcaf477cf34225c604a04b6271";
-    };
-  };
-  glib = {
-    name = "glib-2.10.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/glib-2.10.3.tar.bz2;
-      md5 = "87206e721c12d185d17dd9ecd7e30369";
-    };
-  };
-  gnomemimedata = {
-    name = "gnome-mime-data-2.4.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.2.tar.bz2;
-      md5 = "37242776b08625fa10c73c18b790e552";
-    };
-  };
-  gnomevfs = {
-    name = "gnome-vfs-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gnome-vfs-2.14.2.tar.bz2;
-      md5 = "b657e31974d6981adf9b2c4db981f62c";
-    };
-  };
-  gtk = {
-    name = "gtk+-2.8.20";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtk+-2.8.20.tar.bz2;
-      md5 = "74e7ca98194f1fadfe906e66d763d05d";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.6";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/gtk-doc-1.6.tar.bz2;
-      md5 = "09c7a89efff2e0bbaba02a12bff58dfd";
-    };
-  };
-  intltool = {
-    name = "intltool-0.34.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/intltool-0.34.2.tar.bz2;
-      md5 = "83914f744d927579cc47c52f8b08bf60";
-    };
-  };
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.17";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.17.tar.bz2;
-      md5 = "dfca42529393c8a8f59dc4dc10675a46";
-    };
-  };
-  libbonobo = {
-    name = "libbonobo-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libbonobo-2.14.0.tar.bz2;
-      md5 = "f1f0255f94e3354250d142b688013fad";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libbonoboui-2.14.0.tar.bz2;
-      md5 = "dc26dc17cddc625cac37ecfab263a51a";
-    };
-  };
-  libglade = {
-    name = "libglade-2.6.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libglade-2.6.0.tar.bz2;
-      md5 = "81d7b2b64871ce23a5fae1e5da0b1f6e";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.14.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnome-2.14.1.tar.bz2;
-      md5 = "bf53815df10db62bbf00defd4100b8d8";
-    };
-  };
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.14.0";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomecanvas-2.14.0.tar.bz2;
-      md5 = "516c46fb4a1401b05cfef58c350fbd3d";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.14.1";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libgnomeui-2.14.1.tar.bz2;
-      md5 = "ff6b6c25de0e7e39c79998621cdec048";
-    };
-  };
-  libIDL = {
-    name = "libIDL-0.8.7";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libIDL-0.8.7.tar.bz2;
-      md5 = "53a3874beb42ddfd9a5030047a0db740";
-    };
-  };
-  libxml2 = {
-    name = "libxml2-2.6.26";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libxml2-2.6.26.tar.bz2;
-      md5 = "ce342b4d7b6d83e10cfa4d3f82bf75fd";
-    };
-  };
-  libxslt = {
-    name = "libxslt-1.1.17";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/libxslt-1.1.17.tar.bz2;
-      md5 = "af99d7b06eba109ab374ccd7015561c4";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.14.2";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/ORBit2-2.14.2.tar.bz2;
-      md5 = "88ea9b8e686ab0dd27b4199e0f41ac84";
-    };
-  };
-  pango = {
-    name = "pango-1.12.3";
-    src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/pango-1.12.3.tar.bz2;
-      md5 = "c8178e11a895166d86990bb2c38d831b";
-    };
-  };
-}
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
new file mode 100644
index 000000000000..60ad3f7ff54a
--- /dev/null
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, perl, perlXMLSimple}:
+
+stdenv.mkDerivation {
+  name = "icon-naming-utils-0.8.2";
+  src = fetchurl {
+    url = http://tango-project.org/releases/icon-naming-utils-0.8.2.tar.gz;
+    sha256 = "0ml00nrnd7bkdm09wdj592axwg6v6lcb9yvazc540ls8by6kkzl7";
+  };
+  buildInputs = [perl perlXMLSimple];
+  postInstall = "
+    # Add XML::Simple to the runtime search path.
+    substituteInPlace $out/libexec/icon-name-mapping \\
+        --replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/site_perl';
+    ensureDir $out/lib
+    ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
+  ";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8a7657cf658..112f74c6598d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1062,6 +1062,10 @@ rec {
     inherit fetchurl stdenv perl gettext perlLocaleGettext;
   };
 
+  iconnamingutils = import ../development/tools/misc/icon-naming-utils {
+    inherit fetchurl stdenv perl perlXMLSimple;
+  };
+
   jikespg = import ../development/tools/parsing/jikespg {
     inherit fetchurl stdenv;
   };
@@ -3015,7 +3019,8 @@ rec {
             flex bison popt zlib libxml2 libxslt
             perl perlXMLParser docbook_xml_dtd_42 gettext x11
             libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm
-            python dbus_glib ncurses which libxml2Python;
+            python dbus_glib ncurses which libxml2Python
+            iconnamingutils;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 707b4052d45c..d91365988e41 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -197,6 +197,8 @@ let {
     metacity
     gconfeditor
     gnometerminal
+    gnomeutils
+    gnomepanel
     ;
   };