diff --git a/pkgs/development/libraries/gtk+-1/default.nix b/pkgs/development/libraries/gtk-libs-1.x/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+-1/default.nix
rename to pkgs/development/libraries/gtk-libs-1.x/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
rename to pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/glib/default.nix b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+-1/glib/default.nix
rename to pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
similarity index 100%
rename from pkgs/development/libraries/gtk+-1/gtk+/builder.sh
rename to pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+-1/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/atk/default.nix
rename to pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
diff --git a/pkgs/development/libraries/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs-2.4/default.nix
diff --git a/pkgs/development/libraries/gtk+/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/glib/default.nix
rename to pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/gtk+/default.nix
rename to pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/pango/default.nix
rename to pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
diff --git a/pkgs/development/libraries/freedesktop/default.nix b/pkgs/development/libraries/xlibs/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/default.nix
rename to pkgs/development/libraries/xlibs/default.nix
diff --git a/pkgs/development/libraries/freedesktop/fontconfig/builder.sh b/pkgs/development/libraries/xlibs/fontconfig/builder.sh
similarity index 100%
rename from pkgs/development/libraries/freedesktop/fontconfig/builder.sh
rename to pkgs/development/libraries/xlibs/fontconfig/builder.sh
diff --git a/pkgs/development/libraries/freedesktop/fontconfig/default.nix b/pkgs/development/libraries/xlibs/fontconfig/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/fontconfig/default.nix
rename to pkgs/development/libraries/xlibs/fontconfig/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libICE/default.nix
rename to pkgs/development/libraries/xlibs/libICE/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libSM/default.nix
rename to pkgs/development/libraries/xlibs/libSM/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/xlibs/libX11/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libX11/default.nix
rename to pkgs/development/libraries/xlibs/libX11/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXau/default.nix b/pkgs/development/libraries/xlibs/libXau/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXau/default.nix
rename to pkgs/development/libraries/xlibs/libXau/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXaw/default.nix
rename to pkgs/development/libraries/xlibs/libXaw/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXext/default.nix
rename to pkgs/development/libraries/xlibs/libXext/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXft/default.nix b/pkgs/development/libraries/xlibs/libXft/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXft/default.nix
rename to pkgs/development/libraries/xlibs/libXft/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXmu/default.nix
rename to pkgs/development/libraries/xlibs/libXmu/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXpm/default.nix
rename to pkgs/development/libraries/xlibs/libXpm/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXrender/default.nix b/pkgs/development/libraries/xlibs/libXrender/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXrender/default.nix
rename to pkgs/development/libraries/xlibs/libXrender/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/xlibs/libXt/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXt/default.nix
rename to pkgs/development/libraries/xlibs/libXt/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXtrans/default.nix b/pkgs/development/libraries/xlibs/libXtrans/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/libXtrans/default.nix
rename to pkgs/development/libraries/xlibs/libXtrans/default.nix
diff --git a/pkgs/development/libraries/freedesktop/renderext/default.nix b/pkgs/development/libraries/xlibs/renderext/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/renderext/default.nix
rename to pkgs/development/libraries/xlibs/renderext/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xextensions/default.nix b/pkgs/development/libraries/xlibs/xextensions/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/xextensions/default.nix
rename to pkgs/development/libraries/xlibs/xextensions/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xlibs/builder.sh b/pkgs/development/libraries/xlibs/xlibs/builder.sh
similarity index 100%
rename from pkgs/development/libraries/freedesktop/xlibs/builder.sh
rename to pkgs/development/libraries/xlibs/xlibs/builder.sh
diff --git a/pkgs/development/libraries/freedesktop/xlibs/default.nix b/pkgs/development/libraries/xlibs/xlibs/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/xlibs/default.nix
rename to pkgs/development/libraries/xlibs/xlibs/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xproto/default.nix b/pkgs/development/libraries/xlibs/xproto/default.nix
similarity index 100%
rename from pkgs/development/libraries/freedesktop/xproto/default.nix
rename to pkgs/development/libraries/xlibs/xproto/default.nix
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index cf0997ba853..91579aca3aa 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -383,12 +383,12 @@ rec {
             docbook_xml_dtd perlXMLParser;
   };
 
-  gtkLibs = import ../development/libraries/gtk+ {
+  gtkLibs = import ../development/libraries/gtk-libs-2.4 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
 
-  gtkLibs1 = import ../development/libraries/gtk+-1 {
+  gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
 
@@ -450,7 +450,7 @@ rec {
     inherit fetchurl stdenv zlib;
   };
 
-  xlibs = (import ../development/libraries/freedesktop) {
+  xlibs = (import ../development/libraries/xlibs) {
     inherit fetchurl stdenv pkgconfig freetype expat;
   };
 
@@ -541,7 +541,7 @@ rec {
 
   sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
     inherit fetchurl stdenv openssl;
-    inherit (gtkLibs1) gtk gdkpixbuf;
+    inherit (gtkLibs1x) gtk gdkpixbuf;
     sslSupport = true;
     imageSupport = true;
   };