diff --git a/compile.sh b/compile.sh
index 889ea1f..86c72b5 100755
--- a/compile.sh
+++ b/compile.sh
@@ -96,7 +96,7 @@
 if [ ! -z "$FETCH" ]
 then
     # 1/ libsflphone
-    TESTED_HASH=7104605dd2e7739a1973cee3bbb0fffcfd360bbd
+    TESTED_HASH=00bf4e25091e03ced364b626e64bd92df038ab82
     if [ ! -d "sflphone" ]; then
         echo "sflphone daemon source not found, cloning"
         git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone
@@ -166,9 +166,9 @@
 fi
 
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -O2"
-
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include"
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
+CXXFLAGS="${CXXFLAGS} -I/home/alision/sflphone-android/sflphone-android/jni"
 
 # Make in //
 UNAMES=$(uname -s)
@@ -181,15 +181,6 @@
 MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
 fi
 
-# Build buildsystem tools
-#export PATH=`pwd`/extras/tools/build/bin:$PATH
-#echo "Building tools"
-#cd contrib
-#mkdir native && cd native
-#../bootstrap
-#make $MAKEFLAGS
-#cd ../..
-
 ############
 # Contribs #
 ############
@@ -250,6 +241,9 @@
         echo "Bootstraping"
         cd ../../../
         echo $PWD
+        cd sflphone-android
+        ./make-swig.sh
+        cd ..
         ./configure.sh --with-opensl --without-dbus
         cd sflphone/daemon
         echo "Building"
diff --git a/configure.sh b/configure.sh
index b040131..65118c6 100755
--- a/configure.sh
+++ b/configure.sh
@@ -31,6 +31,7 @@
 
 CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include"
 LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}"
+EXTRA_LDFLAGS+="$LDFLAGS -lgnustl_static"
 
 SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
 ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`