diff --git a/compile.sh b/compile.sh
index 264626bf9f226102597603fd32c45162221f11aa..a9f4cbdba4892d598a09638039a331be50a1b7e8 100755
--- a/compile.sh
+++ b/compile.sh
@@ -246,16 +246,15 @@ else
     CLEAN="distclean"
     if [ ! -f config.h ]; then
         echo "Bootstraping"
-        ../bootstrap
-        echo "Configuring"
-        ${ANDROID_PATH}/configure.sh $OPTS
+        pushd ../../
+        ./configure.sh
+        echo "Building"
+        make $MAKEFLAGS
+        popd
     fi
     TARGET=
 fi
 
-echo "Building"
-make $MAKEFLAGS
-
 ####################################
 # Ring android UI and specific code
 ####################################
diff --git a/configure.sh b/configure.sh
index 0beeccf3a924c4532d67e9589b7555ee2433d20c..4b95c5fe3ba0a6beb8bfc7d986d4118006b778a5 100755
--- a/configure.sh
+++ b/configure.sh
@@ -14,7 +14,7 @@ fi
 # folder.
 ANDROID_API=android-9
 
-SFLPHONE_SOURCEDIR=sflphone/daemon
+SFLPHONE_SOURCEDIR=sflphone
 
 CFLAGS="-g -O2 -fstrict-aliasing -funsafe-math-optimizations"
 if [ -n "$HAVE_ARM" ]; then
@@ -25,7 +25,6 @@ LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
 
 if [ -n "$HAVE_ARM" ]; then
     if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
-        EXTRA_PARAMS=" --enable-neon"
         LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
     fi
 fi
@@ -37,6 +36,9 @@ 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/`
 CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
 
+pushd $SFLPHONE_SOURCEDIR/daemon
+./autogen.sh
+
 CPPFLAGS="$CPPFLAGS" \
 CFLAGS="$CFLAGS ${SFLPHONE_EXTRA_CFLAGS}" \
 CXXFLAGS="$CFLAGS" \
@@ -48,6 +50,6 @@ STRIP="${CROSS_COMPILE}strip" \
 RANLIB="${CROSS_COMPILE}ranlib" \
 AR="${CROSS_COMPILE}ar" \
 PKG_CONFIG_LIBDIR=$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
-sh $SFLPHONE_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $EXTRA_PARAMS \
-                --disable-video \
-                $*
+./configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
+                   --disable-video --without-zrtp --without-dbus --disable-video --without-alsa --without-pulse --with-iax2 --without-tls --with-contrib="../contrib/${TARGET_TUPLE}" \
+                   $*