Index: /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh
===================================================================
--- /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh	(revision 24716)
+++ /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh	(revision 24717)
@@ -261,5 +261,11 @@
     echo "VirtualBox Guest Additions installation, Window System and desktop setup" > $LOG
     begin "Installing the Window System drivers"
-    lib_dir="/usr/lib/VBoxGuestAdditions"
+    if [ "$ARCH" = "amd64" ]
+    then
+        LIB=/usr/lib64
+    else
+        LIB=/usr/lib
+    fi
+    lib_dir="$LIB/VBoxGuestAdditions"
     share_dir="/usr/share/VBoxGuestAdditions"
     test -x "$lib_dir" -a -x "$share_dir" ||
@@ -310,4 +316,6 @@
             vboxvideo_src=vboxvideo_drv_16.so
             vboxmouse_src=vboxmouse_drv_16.so
+            # SUSE with X.Org Server 1.6 knows about vboxvideo
+            test "$system" = "suse" && setupxorgconf=""
             ;;
         1.4.99.* | 1.5.* )
@@ -463,10 +471,4 @@
     semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
     # Install the guest OpenGL drivers
-    if [ "$ARCH" = "amd64" ]
-    then
-        LIB=/usr/lib64
-    else
-        LIB=/usr/lib
-    fi
     if [ -d /usr/lib64/dri ]
     then
@@ -501,6 +503,6 @@
     if test -r "$nobak"; then
         test -r "$main_cfg" &&
-            if test "$main_cfg" -ot "$nobak" -o -n "$legacy"; then
-                rm -f "$main_cfg"
+            if test -n "$legacy" -o ! "$nobak" -ot "$main_cfg"; then
+                rm -f "$nobak" "$main_cfg"
             else
                 newer="$newer`printf "  $main_cfg (no original)\n"`"