diff --git a/packages/x11-toolkits/gtk+/build b/packages/x11/toolkits/gtk+/build
similarity index 99%
rename from packages/x11-toolkits/gtk+/build
rename to packages/x11/toolkits/gtk+/build
index b70725c1b2..a566775d7f 100755
--- a/packages/x11-toolkits/gtk+/build
+++ b/packages/x11/toolkits/gtk+/build
@@ -9,6 +9,7 @@ $SCRIPTS/build jpeg
 $SCRIPTS/build libpng
 $SCRIPTS/build libX11
 $SCRIPTS/build libXrandr
+$SCRIPTS/build libXi
 $SCRIPTS/build glib
 $SCRIPTS/build pango
 $SCRIPTS/build $CAIRO
diff --git a/packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders b/packages/x11/toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders
similarity index 100%
rename from packages/x11-toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders
rename to packages/x11/toolkits/gtk+/init.d/64_gdk-query-pixbuf-loaders
diff --git a/packages/x11-toolkits/gtk+/install b/packages/x11/toolkits/gtk+/install
similarity index 98%
rename from packages/x11-toolkits/gtk+/install
rename to packages/x11/toolkits/gtk+/install
index c30a3a5f4b..4c3bf2eeb1 100755
--- a/packages/x11-toolkits/gtk+/install
+++ b/packages/x11/toolkits/gtk+/install
@@ -8,6 +8,7 @@ $SCRIPTS/install jpeg
 $SCRIPTS/install libpng
 $SCRIPTS/install libX11
 $SCRIPTS/install libXrandr
+$SCRIPTS/install libXi
 $SCRIPTS/install glib
 $SCRIPTS/install pango
 $SCRIPTS/install $CAIRO
diff --git a/packages/x11-toolkits/gtk+/url b/packages/x11/toolkits/gtk+/url
similarity index 100%
rename from packages/x11-toolkits/gtk+/url
rename to packages/x11/toolkits/gtk+/url