--- /dev/null
+diff -aurN libxklavier-2.0.orig/libxklavier/xklavier_config_xkb.c libxklavier-2.0/libxklavier/xklavier_config_xkb.c
+--- libxklavier-2.0.orig/libxklavier/xklavier_config_xkb.c 2005-02-24 01:40:50.000000000 +0100
++++ libxklavier-2.0/libxklavier/xklavier_config_xkb.c 2005-12-03 16:33:14.000000000 +0100
+@@ -223,7 +223,7 @@
+ exit( 1 );
+ default:
+ /* parent */
+- pid = wait( &status );
++ pid = waitpid( cpid, &status, 0 );
+ XklDebug( 150, "Return status of %d (well, started %d): %d\n", pid, cpid, status );
+ memset( (char *)&result, 0, sizeof(result) );
+ result.xkb = XkbAllocKeyboard();