--- xdotool.c.orig	2010-05-26 00:44:44.000000000 +0200
+++ xdotool.c	2010-06-11 17:57:58.781041466 +0200
@@ -175,7 +175,11 @@
     }
   }
 
-  PROGRAM = *argv;
+  if ( (PROGRAM = strrchr(argv[0], '/') ) != NULL) {
+    PROGRAM++;
+  } else {
+    PROGRAM = argv[0];
+  }
   argv++; argc--;
   cmd = *argv; /* argv[1] */
 
@@ -193,7 +197,7 @@
   }
 
   if (!cmd_found) {
-    fprintf(stderr, "%s: Unknown command: %s\n", strrchr(PROGRAM, '/') + 1, cmd);
+    fprintf(stderr, "%s: Unknown command: %s\n", PROGRAM, cmd);
     fprintf(stderr, "Run '%s help' if you want a command list\n", PROGRAM);
     ret = 1;
   }