diff --git a/configure b/configure
index 2296f327c1bfafbdcd6402d3c3ddb91788f3beff..a9f0c13fe1f4f39b0fce0182d2e8d5e8328b69cb 100755
--- a/configure
+++ b/configure
@@ -68,6 +68,10 @@ Optional features:
   --enable-slashpackage[=ROOT]     assume /package installation at ROOT [disabled]
   --enable-absolute-paths          do not rely on PATH to access this package's binaries,
                                    hardcode absolute BINDIR/foobar paths instead [disabled]
+  
+  If no --prefix option is given, by default sysdeps will be fetched from
+  /usr/lib/skalibs/sysdeps.
+
 EOF
 exit 0
 }
@@ -428,7 +432,6 @@ fi
 spawn_lib=$(cat $sysdeps/spawn.lib)
 socket_lib=$(cat $sysdeps/socket.lib)
 sysclock_lib=$(cat $sysdeps/sysclock.lib)
-tainnow_lib=$(cat $sysdeps/tainnow.lib)
 timer_lib=$(cat $sysdeps/timer.lib)
 util_lib=$(cat $sysdeps/util.lib)
 
@@ -524,11 +527,10 @@ exthome := $exthome
 SPAWN_LIB := ${spawn_lib}
 SOCKET_LIB := ${socket_lib}
 SYSCLOCK_LIB := ${sysclock_lib}
-TAINNOW_LIB := ${tainnow_lib}
 TIMER_LIB := ${timer_lib}
 UTIL_LIB := ${util_lib}
 
-CC := ${CC_AUTO##${cross}}
+CC := ${CC_AUTO}
 CPPFLAGS_AUTO := $CPPFLAGS_AUTO
 CPPFLAGS := $CPPFLAGS $CPPFLAGS_POST
 CFLAGS_AUTO := $CFLAGS_AUTO