--- a/configure	Wed Jun 13 19:07:41 2012 +0200
+++ b/configure	Wed Jun 13 19:08:58 2012 +0200
@@ -88,7 +88,7 @@
 rm -f $test $test.c
 
 if [ "$XENO_CONFIG" = "" ]; then
-	XENO_CONFIG=/usr/xenomai/bin/xeno-config
+	XENO_CONFIG=xeno-config
 fi
 
 if [ "$RTAI_CONFIG" = "" ]; then
@@ -482,9 +482,8 @@
 fi
 
 if [ "$SUB_TIMERS_DRIVER" = "xeno" ]; then
-	RT_LIB_DIR=`$XENO_CONFIG --library-dir`\ -Wl,-rpath\ `$XENO_CONFIG --library-dir`
-    SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ `$XENO_CONFIG --xeno-ldflags`\ -L$RT_LIB_DIR\ -lnative\ -lrtdm
-	SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -DUSE_XENO\ `$XENO_CONFIG --xeno-cflags`
+    SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ `$XENO_CONFIG --skin=native --ldflags`\ -lrtdm
+	SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -DUSE_XENO\ `$XENO_CONFIG --skin=rtdm --cflags`
     RTCAN_SOCKET=1
 fi