diff --git a/cross/init.sh b/cross/init.sh
index fe41ba6..8d5f436 100755
--- a/cross/init.sh
+++ b/cross/init.sh
@@ -51,9 +51,9 @@ function dynpatch {
 
 
 # setup Jehanne's headers
-#usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/syscalls.h
+usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/syscalls.h
 
-#mkdir -p $WORKING_DIR
+mkdir -p $WORKING_DIR
 date > $LOG
 
 # verify libtool is installed
@@ -106,6 +106,7 @@ echo -n Building gcc... | tee -a $WORKING_DIR/gcc.build.log
 # Patch and build gcc
 export GCC_BUILD_DIR=$WORKING_DIR/build/gcc
 mkdir -p $GCC_BUILD_DIR
+export CPATH="$WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include:$WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include-fixed"
 
 (
 	cd $WORKING_DIR &&
@@ -116,9 +117,9 @@ mkdir -p $GCC_BUILD_DIR
 	( cd gcc && ./contrib/download_prerequisites ) &&
 #	( cd gcc/libstdc++-v3 && autoconf -i ) &&
 	cd $GCC_BUILD_DIR &&
-	$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --enable-languages=c,c++ --disable-multilib --disable-threads --disable-tls --disable-initfini-array --disable-bootstrap --disable-nls &&
-	make all-gcc && 
-	make DESTDIR=$WORKING_DIR/cross install-gcc 
+	$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --enable-languages=c,c++ --disable-multiarch --disable-multilib --disable-threads --disable-tls --disable-initfini-array --disable-bootstrap --disable-nls &&
+	make all-gcc all-target-libgcc && 
+	make DESTDIR=$WORKING_DIR/cross install-gcc  install-target-libgcc
 #	make all-gcc all-target-libgcc && 
 #	make DESTDIR=$JEHANNE/pkgs/gcc/9.2.0/ install-gcc install-target-libgcc
 #	 &&
diff --git a/devshell.sh b/devshell.sh
index 703f04d..437aac2 100755
--- a/devshell.sh
+++ b/devshell.sh
@@ -5,9 +5,14 @@
 # Copyright (C) 2016-2017 Giacomo Tesio <giacomo@tesio.it>
 
 export JEHANNE=`git rev-parse --show-toplevel`
+REPONAME=`basename $JEHANNE`
+JEHANNE_TOOLCHAIN=`dirname $JEHANNE`
+JEHANNE_TOOLCHAIN="$JEHANNE_TOOLCHAIN/$REPONAME.TOOLCHAIN"
+
+
 export PATH="$JEHANNE/hacking/bin:$PATH"
-export PATH="$JEHANNE/hacking/cross/toolchain/bin:$PATH"
-export CPATH="$JEHANNE/hacking/cross/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include:$JEHANNE/hacking/cross/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include-fixed"
+export PATH="$JEHANNE_TOOLCHAIN/cross/posix/bin:$PATH"
+export CPATH="$JEHANNE_TOOLCHAIN/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include:$JEHANNE_TOOLCHAIN/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include-fixed"
 export ARCH=amd64
 
 export TOOLPREFIX=x86_64-jehanne-