diff --git a/packages/other/pigment/install b/packages/other/pigment/install
index 8024440ea0..057c2e55a8 100755
--- a/packages/other/pigment/install
+++ b/packages/other/pigment/install
@@ -16,14 +16,16 @@ $SCRIPTS/install libX11
 $SCRIPTS/install glib
 $SCRIPTS/install gtk+
 
+PLUGINS_DIR=`pkg-config pigment-0.3 --define-variable=prefix=/usr --variable=pluginsdir`
+
 mkdir -p $INSTALL/usr/lib
 cp -PR $BUILD/$1*/pgm/.libs/libpigment*.so* $INSTALL/usr/lib
 cp -PR $BUILD/$1*/pgm/gtk/.libs/libpigment*.so* $INSTALL/usr/lib
 cp -PR $BUILD/$1*/pgm/imaging/.libs/libpigment*.so* $INSTALL/usr/lib
 rm -rf $INSTALL/usr/lib/libpigment*.so*T
 
-mkdir -p $INSTALL/usr/lib/pigment-0.3/0.3.16
-cp -PR $BUILD/$1*/plugins/*/.libs/libpgm*.so $INSTALL/usr/lib/pigment-0.3/0.3.16
+mkdir -p $INSTALL/$PLUGINS_DIR
+cp -PR $BUILD/$1*/plugins/*/.libs/libpgm*.so $INSTALL/$PLUGINS_DIR
 
 
 
diff --git a/packages/sysutils/busybox/init.d/80_debug b/packages/sysutils/busybox/init.d/80_debug
index cb8189e6cf..54cc220e73 100755
--- a/packages/sysutils/busybox/init.d/80_debug
+++ b/packages/sysutils/busybox/init.d/80_debug
@@ -2,7 +2,7 @@
 #
 # start a debugging shell
 #
-# runlevels: text debug
+# runlevels: text, debug
 
 . /etc/sysconfig
 
diff --git a/packages/x11-toolkits/gtk+/build.test b/packages/x11-toolkits/gtk+/build.test
deleted file mode 100755
index 37aa7b5a18..0000000000
--- a/packages/x11-toolkits/gtk+/build.test
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIGURE=" ./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr
-            --bindir=/usr/bin
-            --sbindir=/usr/sbin
-            --sysconfdir=/etc
-            --localstatedir=/var
-            --libdir=/usr/lib
-            --includedir=/usr/include
-            --datarootdir=/usr/share
-            --datadir=/usr/share
-            --infodir=/usr/share/info
-            --localedir=/usr/share/locale
-            --mandir=/usr/share/man
-            --disable-static \
-            --enable-shared"
-
-
-
diff --git a/packages/x11-toolkits/gtk+/config/gdk-pixbuf.loaders b/packages/x11-toolkits/gtk+/config/gdk-pixbuf.loaders
deleted file mode 100644
index 4309fb28f2..0000000000
--- a/packages/x11-toolkits/gtk+/config/gdk-pixbuf.loaders
+++ /dev/null
@@ -1,117 +0,0 @@
-# GdkPixbuf Image Loader Modules file
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.14.4
-#
-# LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders
-#
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
-"ani" 4 "gtk20" "The ANI image format" "LGPL"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
-"gif" 4 "gtk20" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
-"ico" 5 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
-"pcx" 4 "gtk20" "The PCX image format" "LGPL"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
-"png" 5 "gtk20" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
-"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
-"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
-"tga" 4 "gtk20" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
-"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
-"wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-"  " "zz" 1
-" `" "z " 1
-" @" "z " 1
-"  " "z " 1
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
-"xbm" 4 "gtk20" "The XBM image format" "LGPL"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
-"xpm" 4 "gtk20" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
diff --git a/packages/x11-toolkits/gtk+/install b/packages/x11-toolkits/gtk+/install
index c0759bcdec..909ad4a579 100755
--- a/packages/x11-toolkits/gtk+/install
+++ b/packages/x11-toolkits/gtk+/install
@@ -12,7 +12,8 @@ $SCRIPTS/install glib
 $SCRIPTS/install pango
 $SCRIPTS/install cairo
 
-GTK_LIB_DIR="gtk-2.0/2.10.0"
+GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+GTK_LIB_DIR="gtk-2.0/$GTK_BINARY_VERSION"
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/lib
diff --git a/packages/x11-toolkits/gtk+/install.test b/packages/x11-toolkits/gtk+/install.test
deleted file mode 100755
index f8902b206f..0000000000
--- a/packages/x11-toolkits/gtk+/install.test
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-#$SCRIPTS/install atk
-$SCRIPTS/install tiff
-$SCRIPTS/install jpeg
-$SCRIPTS/install  libpng
-$SCRIPTS/install libX11
-$SCRIPTS/install libXrandr
-$SCRIPTS/install glib
-$SCRIPTS/install pango
-$SCRIPTS/install cairo
-
-GTK_LIB_DIR="gtk-2.0/2.10.0"
-
-cd $BUILD/$1*
-
-make SRC_SUBDIRS="gdk-pixbuf gdk gtk modules perf contrib" DESTDIR=$ROOT/$INSTALL install
diff --git a/packages/x11-toolkits/gtk+/url.old b/packages/x11-toolkits/gtk+/url.old
deleted file mode 100644
index 156606f252..0000000000
--- a/packages/x11-toolkits/gtk+/url.old
+++ /dev/null
@@ -1,2 +0,0 @@
-http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-2.12.11.tar.bz2
-
diff --git a/packages/x11-toolkits/pango/install b/packages/x11-toolkits/pango/install
index b38259e7a8..32bba23ac7 100755
--- a/packages/x11-toolkits/pango/install
+++ b/packages/x11-toolkits/pango/install
@@ -9,13 +9,14 @@ $SCRIPTS/install fontconfig
 $SCRIPTS/install libX11
 $SCRIPTS/install libXft
 
+MODULE_VERSION=`pkg-config pango --variable=pango_module_version`
 mkdir -p $INSTALL/usr/lib
 cp -PR $BUILD/$1*/pango/.libs/libpango*.so* $INSTALL/usr/lib
 rm -rf $INSTALL/usr/lib/libpango*.so*T
 
-mkdir -p $INSTALL/usr/lib/pango/1.6.0/modules
+mkdir -p $INSTALL/usr/lib/pango/$MODULE_VERSION/modules
 cp -PR $BUILD/$1*/modules/*/.libs/*.so \
-    $INSTALL/usr/lib/pango/1.6.0/modules
+    $INSTALL/usr/lib/pango/$MODULE_VERSION/modules
 
 mkdir -p $INSTALL/usr/bin
 cp -PR $BUILD/$1*/pango/.libs/pango-querymodules $INSTALL/usr/bin