Index: /trunk/src/VBox/Additions/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 29405)
+++ /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 29406)
@@ -308,4 +308,6 @@
 	$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
 	$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
+	$(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \
+	$(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \
 	$(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \
 	selinux-fedora/vbox_x11.pp
Index: /trunk/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules
===================================================================
--- /trunk/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules	(revision 29406)
+++ /trunk/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules	(revision 29406)
@@ -0,0 +1,1 @@
+KERNEL=="vboxguest",ENV{ID_INPUT}="1"
Index: /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh
===================================================================
--- /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh	(revision 29405)
+++ /trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh	(revision 29406)
@@ -284,10 +284,10 @@
     # By default, we want to run our xorg.conf setup script
     setupxorgconf="true"
+    # But not to install the configuration file into xorg.conf.d
+    doxorgconfd=""
     # But without the workaround for SUSE 11.1 not doing input auto-detection
     newmouse=""
     # By default we want to use hal/udev/whatever for auto-loading the mouse driver
     automouse="--autoMouse"
-    # But we only install the udev rule if we detect a server that needs it
-    udevmouse=""
     # We need to tell our xorg.conf hacking script whether /dev/psaux exists
     nopsaux="--nopsaux"
@@ -322,4 +322,5 @@
             vboxvideo_src=vboxvideo_drv_18.so
             vboxmouse_src=vboxmouse_drv_18.so
+            doxorgconfd="true"
             setupxorgconf=""
             ;;
@@ -329,5 +330,5 @@
             vboxmouse_src=vboxmouse_drv_17.so
             setupxorgconf=""
-            test "$system" = "debian" && udevmouse="true"
+            test "$system" = "debian" && doxorgconfd="true"
             ;;
         1.5.99.* | 1.6.* )
@@ -460,10 +461,9 @@
                 rm -r /var/cache/hald/fdi-cache 2> /dev/null
             fi
-        test -n "$udevmouse" &&
-            if [ -d /etc/udev/rules.d ]
+        if test -n "$doxorgconfd"
+        then
+            if test -d /etc/udev/rules.d
             then
-                echo "KERNEL==\"vboxguest\",ENV{ID_INPUT}=\"1\"" > /etc/udev/rules.d/70-xorg-vboxmouse.rules
-                echo "KERNEL==\"vboxguest\",ENV{ID_INPUT_MOUSE}=\"1\"" >> /etc/udev/rules.d/70-xorg-vboxmouse.rules
-                echo "KERNEL==\"vboxguest\",ENV{x11_driver}=\"vboxmouse\"" >> /etc/udev/rules.d/70-xorg-vboxmouse.rules
+                install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d
                 # This is normally silent.  I have purposely not redirected
                 # error output as I want to know if something goes wrong,
@@ -471,4 +471,9 @@
                 udevadm trigger --action=change
             fi
+            test -d /usr/share/X11/xorg.conf.d &&
+                install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/share/X11/xorg.conf.d
+            test -d /usr/lib/X11/xorg.conf.d &&
+                install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/lib/X11/xorg.conf.d
+        fi
         succ_msg
         test -n "$generated" &&
@@ -602,4 +607,6 @@
     rm /etc/udev/rules.d/70-xorg-vboxmouse.rules 2>/dev/null
     udevadm trigger --action=change 2>/dev/null
+    rm /usr/lib/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null
+    rm /usr/share/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null
     rm /usr/share/xserver-xorg/pci/vboxvideo.ids 2>/dev/null
 }
Index: /trunk/src/VBox/Additions/x11/Installer/50-vboxmouse.conf
===================================================================
--- /trunk/src/VBox/Additions/x11/Installer/50-vboxmouse.conf	(revision 29406)
+++ /trunk/src/VBox/Additions/x11/Installer/50-vboxmouse.conf	(revision 29406)
@@ -0,0 +1,5 @@
+Section "InputClass"
+	Identifier	"vboxmouse"
+	MatchDevicePath	"/dev/vboxguest"
+	Driver		"vboxmouse"
+EndSection