diff --git a/livesupport/Makefile b/livesupport/Makefile
index a5fcc424f..dba956af4 100644
--- a/livesupport/Makefile
+++ b/livesupport/Makefile
@@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Author : $Author: fgerlits $
-# Version : $Revision: 1.25 $
+# Author : $Author: maroy $
+# Version : $Revision: 1.26 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $
#-------------------------------------------------------------------------------
@@ -79,9 +79,9 @@ LCOV_VERSION = lcov-1.3
HELIX_DIR = ${TOOLS_DIR}/helix
HELIX_VERSION = hxclient_1_3_0_neptunex-2004-12-15
GTK_DIR = ${TOOLS_DIR}/gtk+
-GTK_VERSION = gtk+-2.4.13
+GTK_VERSION = gtk+-2.6.1
GTKMM_DIR = ${TOOLS_DIR}/gtkmm
-GTKMM_VERSION = gtkmm-2.4.7
+GTKMM_VERSION = gtkmm-2.5.5
ICU_DIR = ${TOOLS_DIR}/icu
ICU_VERSION = icu-3.0
CURL_DIR = ${TOOLS_DIR}/curl
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh b/livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh
new file mode 100755
index 000000000..b99676b71
--- /dev/null
+++ b/livesupport/tools/gtk+/gtk+-2.6.1/bin/install.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+# Copyright (c) 2004 Media Development Loan Fund
+#
+# This file is part of the LiveSupport project.
+# http://livesupport.campware.org/
+# To report bugs, send an e-mail to bugs@campware.org
+#
+# LiveSupport is free software; you can redistribute it and/or modify
+# it 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.
+#
+# LiveSupport is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LiveSupport; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#
+# Author : $Author: maroy $
+# Version : $Revision: 1.1 $
+# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtk+/gtk+-2.6.1/bin/Attic/install.sh,v $
+#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
+# Run this script to install GTK+ 2.6 into the development system usr
+# environment.
+# For more information on GTK+, see http://www.gtk.org/
+# This script will install GTK+, and its intermediate dependencies as well
+#-------------------------------------------------------------------------------
+glib_product=glib-2.6.1
+tiff_product=tiff-3.7.1
+pango_product=pango-1.8.0
+atk_product=atk-1.9.0
+gtk_product=gtk+-2.6.1
+
+reldir=`dirname $0`/..
+basedir=`cd $reldir; pwd;`
+installdir=`cd $basedir/../../../usr; pwd;`
+tmpdir=$basedir/tmp
+etcdir=$basedir/etc
+usrdir=$installdir
+
+glib_tar=$basedir/src/$glib_product.tar.bz2
+tiff_tar=$basedir/src/$tiff_product.tar.gz
+pango_tar=$basedir/src/$pango_product.tar.bz2
+atk_tar=$basedir/src/$atk_product.tar.bz2
+gtk_tar=$basedir/src/$gtk_product.tar.bz2
+
+export CPPFLAGS="-I$installdir/include"
+export LDFLAGS="-L$installdir/lib"
+export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
+
+mkdir -p $tmpdir
+
+# compile & install tiff
+echo "installing $tiff_product from $basedir to $installdir"
+cd $tmpdir
+tar xfz $tiff_tar
+cd $tiff_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install glib
+echo "installing $glib_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $glib_tar
+cd $glib_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install pango
+echo "installing $pango_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $pango_tar
+cd $pango_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install atk
+echo "installing $atk_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $atk_tar
+cd $atk_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install gtk+
+echo "installing $gtk_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $gtk_tar
+cd $gtk_product
+./configure --prefix=$installdir
+make && make install
+
+
+# clean up
+cd $basedir
+rm -rf $tmpdir
+
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/src/atk-1.9.0.tar.bz2 b/livesupport/tools/gtk+/gtk+-2.6.1/src/atk-1.9.0.tar.bz2
new file mode 100644
index 000000000..76ba4470c
Binary files /dev/null and b/livesupport/tools/gtk+/gtk+-2.6.1/src/atk-1.9.0.tar.bz2 differ
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/src/glib-2.6.1.tar.bz2 b/livesupport/tools/gtk+/gtk+-2.6.1/src/glib-2.6.1.tar.bz2
new file mode 100644
index 000000000..d4aef734c
Binary files /dev/null and b/livesupport/tools/gtk+/gtk+-2.6.1/src/glib-2.6.1.tar.bz2 differ
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/src/gtk+-2.6.1.tar.bz2 b/livesupport/tools/gtk+/gtk+-2.6.1/src/gtk+-2.6.1.tar.bz2
new file mode 100644
index 000000000..807e0cf85
Binary files /dev/null and b/livesupport/tools/gtk+/gtk+-2.6.1/src/gtk+-2.6.1.tar.bz2 differ
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/src/pango-1.8.0.tar.bz2 b/livesupport/tools/gtk+/gtk+-2.6.1/src/pango-1.8.0.tar.bz2
new file mode 100644
index 000000000..2e1786c6e
Binary files /dev/null and b/livesupport/tools/gtk+/gtk+-2.6.1/src/pango-1.8.0.tar.bz2 differ
diff --git a/livesupport/tools/gtk+/gtk+-2.6.1/src/tiff-3.7.1.tar.gz b/livesupport/tools/gtk+/gtk+-2.6.1/src/tiff-3.7.1.tar.gz
new file mode 100644
index 000000000..f631eb8e3
Binary files /dev/null and b/livesupport/tools/gtk+/gtk+-2.6.1/src/tiff-3.7.1.tar.gz differ
diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh
new file mode 100755
index 000000000..0f0d1962f
--- /dev/null
+++ b/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/install.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+# Copyright (c) 2004 Media Development Loan Fund
+#
+# This file is part of the LiveSupport project.
+# http://livesupport.campware.org/
+# To report bugs, send an e-mail to bugs@campware.org
+#
+# LiveSupport is free software; you can redistribute it and/or modify
+# it 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.
+#
+# LiveSupport is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LiveSupport; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#
+# Author : $Author: maroy $
+# Version : $Revision: 1.1 $
+# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gtkmm/gtkmm-2.5.5/bin/Attic/install.sh,v $
+#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
+# Run this script to install GTK-- 2.5 into the development system usr
+# environment.
+# For more information on GTK--, see http://gtkmm.sourceforge.net/
+# This script will install GTK--, and its intermediate dependencies as well
+#-------------------------------------------------------------------------------
+sigc_product=libsigc++-2.0.6
+glibmm_product=glibmm-2.5.4
+gtkmm_product=gtkmm-2.5.5
+
+reldir=`dirname $0`/..
+basedir=`cd $reldir; pwd;`
+installdir=`cd $basedir/../../../usr; pwd;`
+tmpdir=$basedir/tmp
+etcdir=$basedir/etc
+usrdir=$installdir
+
+sigc_tar=$basedir/src/$sigc_product.tar.bz2
+glibmm_tar=$basedir/src/$glibmm_product.tar.bz2
+gtkmm_tar=$basedir/src/$gtkmm_product.tar.bz2
+
+export CPPFLAGS="-I$installdir/include"
+export LDFLAGS="-L$installdir/lib"
+export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
+
+mkdir -p $tmpdir
+
+# compile & install sigc first
+echo "installing $sigc_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $sigc_tar
+cd $sigc_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install glibmm
+echo "installing $glibmm_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $glibmm_tar
+cd $glibmm_product
+./configure --prefix=$installdir
+make && make install
+
+# compile & install gtkmm
+echo "installing $gtkmm_product from $basedir to $installdir"
+cd $tmpdir
+tar xfj $gtkmm_tar
+cd $gtkmm_product
+./configure --prefix=$installdir
+make && make install
+
+
+# clean up
+cd $basedir
+rm -rf $tmpdir
+
diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/src/glibmm-2.5.4.tar.bz2 b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/glibmm-2.5.4.tar.bz2
new file mode 100644
index 000000000..515b09b43
Binary files /dev/null and b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/glibmm-2.5.4.tar.bz2 differ
diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/src/gtkmm-2.5.5.tar.bz2 b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/gtkmm-2.5.5.tar.bz2
new file mode 100644
index 000000000..9d3e1c525
Binary files /dev/null and b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/gtkmm-2.5.5.tar.bz2 differ
diff --git a/livesupport/tools/gtkmm/gtkmm-2.5.5/src/libsigc++-2.0.6.tar.bz2 b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/libsigc++-2.0.6.tar.bz2
new file mode 100644
index 000000000..61ba6e2ed
Binary files /dev/null and b/livesupport/tools/gtkmm/gtkmm-2.5.5/src/libsigc++-2.0.6.tar.bz2 differ