diff -ru vmware-tools-distrib.orig/bin/vmware-config-tools.pl vmware-tools-distrib/bin/vmware-config-tools.pl
--- vmware-tools-distrib.orig/bin/vmware-config-tools.pl        2004-06-11 02:52:10.000000000 +0200
+++ vmware-tools-distrib/bin/vmware-config-tools.pl     2004-10-18 20:24:01.966295392 +0200
@@ -2849,7 +2849,7 @@
 }

 sub xserver4 {
-  return xserver_bin() . '/XFree86';
+  return xserver_bin() . '/Xorg';
 }

 sub xserver3 {
@@ -3052,7 +3052,7 @@
   # string. Maybe it will once it settles down.
   if ($xversionAll eq "0.0.0") {
       $xversionAll = direct_command(shell_string(xserver4()) . ' -version 2>&1') =~
-         /X.org Foundation/ ? '4.4.0' : '0.0.0';
+         /X.org Foundation/ ? '4.4.0' : '4.4.0';
   }

   # This search order is issued from the XF86Config man page.
@@ -3063,6 +3063,8 @@
            file_name_exist('/usr/X11R6/etc/X11/' . $ENV{'XF86CONFIG'})) {
     $xconfig_path = '/usr/X11R6/etc/X11';
     $xconfig_file_name = $ENV{'XF86CONFIG'};
+  } elsif (file_name_exist($xconfig_path . '/xorg.conf')) {
+    $xconfig_file_name = 'xorg.conf';
   } elsif (file_name_exist($xconfig_path . '/XF86Config-4')) {
     $xconfig_file_name = 'XF86Config-4';
   } elsif (file_name_exist($xconfig_path . '/XF86Config')) {
@@ -3435,7 +3437,7 @@
   my $inSection = 0;
   my @currentSection;
   my $sectionLine;
-  my $keybRegex = 'driver\s+\"keyboard\"';
+  my $keybRegex = 'driver\s+\"(keyboard|kbd)\"';
   my $kbdIdentifier = 'Keyboard';

   my ($line, $copy);
@@ -3568,6 +3570,7 @@
     if ($major == 4 && $minor >= 2 &&
         file_name_exist($cX4MouseDriverFile)) {
       $line =~ s/%MOUSE_DRIVER%/vmmouse/g;
+      $line =~ s-/dev/mouse-/dev/input/mice-;
     } else {
       $line =~ s/%MOUSE_DRIVER%/mouse/g;