diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh
index 8194fef83..ce2f8728e 100755
--- a/livesupport/bin/copyInstall.sh
+++ b/livesupport/bin/copyInstall.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.3 $
+#   Version  : $Revision: 1.4 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -147,9 +147,10 @@ cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI
 
 
 #-------------------------------------------------------------------------------
-#  Copy libraries
+#  Copy libraries and related files
 #-------------------------------------------------------------------------------
 cp -pPR $usrdir/lib/* $install_lib
+cp -pPR $usrdir/etc/* $install_etc
 
 
 #-------------------------------------------------------------------------------
diff --git a/livesupport/bin/install.sh b/livesupport/bin/install.sh
index 1fc46d674..b4cf4ebce 100755
--- a/livesupport/bin/install.sh
+++ b/livesupport/bin/install.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.9 $
+#   Version  : $Revision: 1.10 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/install.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -193,6 +193,16 @@ echo "  apache document root:   $www_root";
 echo ""
 
 
+#-------------------------------------------------------------------------------
+#   Check if we're in the CVS, and bail out if so
+#-------------------------------------------------------------------------------
+if [ -f CVS/Root ]; then
+    echo "ERROR: this script is not intended to be run from the CVS sources.";
+    echo "       run this script from inside the source tarball";
+    exit 1;
+fi
+
+
 #-------------------------------------------------------------------------------
 #   Do pre-install checks
 #-------------------------------------------------------------------------------
diff --git a/livesupport/bin/postInstallGLiveSupport.sh b/livesupport/bin/postInstallGLiveSupport.sh
index 06f22bf05..6bce05f14 100755
--- a/livesupport/bin/postInstallGLiveSupport.sh
+++ b/livesupport/bin/postInstallGLiveSupport.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.1 $
+#   Version  : $Revision: 1.2 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -208,6 +208,24 @@ check_exe "sed" || exit 1;
 #-------------------------------------------------------------------------------
 echo "Customizing configuration files..."
 
+tmp_file=/tmp/livesupport_setup.$$
+
+# customize the GTK- config files, which have hard-coded values in them :(
+cat $install_etc/gtk-2.0/gdk-pixbuf.loaders \
+    | sed -e "s/^\"\/.*\/usr\/lib/\/\"$installdir_s\/lib/g"
+    > $tmp_file
+mv -f $tmp_file $install_etc/gtk-2.0/gdk-pixbuf.loaders
+
+# customize the pango config files, which have hard-coded values in them :(
+pango_rc=$install_etc/pango/pango.rc
+echo "[Pango]" > $pango_rc
+echo "ModuleFiles=$install_etc/pango/pango.modules" > $pango_rc
+cat $install_etc/pango/pango.modules \
+    | sed -e "s/^\/.*\/usr\/lib/\/$installdir_s\/lib/g"
+    > $tmp_file
+mv -f $tmp_file $install_etc/pango/pango.modules
+
+# customize the gLiveSupport config file
 cat $install_etc/gLiveSupport.xml.template \
     | sed -e "$replace_sed_string" \
     > $install_etc/gLiveSupport.xml
diff --git a/livesupport/products/gLiveSupport/bin/gLiveSupport.sh b/livesupport/products/gLiveSupport/bin/gLiveSupport.sh
index 672b90e42..03134d4ab 100755
--- a/livesupport/products/gLiveSupport/bin/gLiveSupport.sh
+++ b/livesupport/products/gLiveSupport/bin/gLiveSupport.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.1 $
+#   Version  : $Revision: 1.2 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/bin/gLiveSupport.sh,v $
 #-------------------------------------------------------------------------------
 
@@ -47,6 +47,8 @@ tmpdir=$basedir/tmp
 #  Set up the environment
 #-------------------------------------------------------------------------------
 export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+export GDK_PIXBUF_MODULE_FILE=$etcdir/gtk-2.0/gdk-pixbuf.loaders
+export PANGO_RC_FILE=$etcdir/pango/pango.rc
 gLiveSupport_exe=$bindir/gLiveSupport
 config_file=$etcdir/gLiveSupport.xml