diff --git a/configure.in b/configure.in
index 4a859ce32..ddfb4dcc6 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_ARG_WITH(product-id, [AS_HELP_STRING([--with-product-id=productID], [Specify
 AC_ARG_ENABLE(ldid, [AS_HELP_STRING([--enable-ldid], [Code sign binaries with ldid])], USE_LDID=$enableval, USE_LDID_ID="no")  
 AC_ARG_WITH(developer-path, [AS_HELP_STRING([--with-developer-path=path],
 [Specify toolchain path])], DEVELOPER_PATH=$withval, DEVELOPER_PATH="/Developer/Platforms/iPhoneOS.platform/Developer")  
-AC_ARG_WITH(sdk-version, [AS_HELP_STRING([--with-sdk-version=2.0], [Specify SDK version])], SDK_VERSION=$withval, SDK_VERSION="2.0")  
+AC_ARG_WITH(sdk-version, [AS_HELP_STRING([--with-sdk-version=3.0], [Specify SDK version])], SDK_VERSION=$withval, SDK_VERSION="3.0")  
 AC_ARG_WITH(gcc-version, [AS_HELP_STRING([--with-gcc-version=4.2.1], [Specify GCC version])], GCC_VERSION=$withval, GCC_VERSION="4.2.1")  
 
 # BUILD/HOST/TARGET
@@ -113,14 +113,10 @@ if test "x$target" = xiphone; then
             CC="$DEVELOPER_PATH/usr/bin/arm-apple-darwin$darwin_v-gcc-$GCC_VERSION"
             OBJC="$DEVELOPER_PATH/usr/bin/arm-apple-darwin$darwin_v-g++-$GCC_VERSION"
             CFLAGS="$CFLAGS -g"
-            CPPFLAGS="$CPPFLAGS -I$SDK_PATH/usr/include"
-            CPPFLAGS="$CPPFLAGS -I$SDK_PATH/usr/lib/gcc/arm-apple-darwin$darwin_v/$GCC_VERSION/include"
-            CPPFLAGS="$CPPFLAGS -F$SDK_PATH/System/Library/Frameworks"
-            LDFLAGS="$LDFLAGS -F$SDK_PATH/System/Library/Frameworks"
-            LDFLAGS="$LDFLAGS -L$SDK_PATH/usr/lib -framework Foundation -framework CoreFoundation -framework UIKit"
-            LDFLAGS="$LDFLAGS -L$SDK_PATH/System/Library/Frameworks/IOKit.framework/Versions/A"
+            CPPFLAGS="$CPPFLAGS -isysroot $SDK_PATH"
+            LDFLAGS="$LDFLAGS -framework Foundation -framework CoreFoundation -framework UIKit -lobjc"
+            LDFLAGS="$LDFLAGS -L$SDK_PATH/System/Library/Frameworks/IOKit.framework/Versions/A -lIOKit"
             LDFLAGS="$LDFLAGS $SDK_PATH/System/Library/PrivateFrameworks/BluetoothManager.framework/BluetoothManager"
-            LDFLAGS="$LDFLAGS -lIOKit -lobjc"
 		   ;;
         linux*)
             echo "Cross-compiling for iPhone/iPod touch using Apple's iPhone SDK $SDK_VERSION, GCC $GCC_VERSION"
@@ -139,14 +135,10 @@ if test "x$target" = xiphone; then
             CC="$DEVELOPER_PATH/pre/bin/arm-apple-darwin$darwin_v-gcc-$GCC_VERSION"
             OBJC="$DEVELOPER_PATH/pre/bin/arm-apple-darwin$darwin_v-g++"
             CFLAGS="$CFLAGS -g"
-            CPPFLAGS="$CPPFLAGS -I$SDK_PATH/usr/include"
-            CPPFLAGS="$CPPFLAGS -I$SDK_PATH/usr/lib/gcc/arm-apple-darwin$darwin_v/$GCC_VERSION/include"
-            CPPFLAGS="$CPPFLAGS -F$SDK_PATH/System/Library/Frameworks"
-            LDFLAGS="$LDFLAGS -F$SDK_PATH/System/Library/Frameworks"
-            LDFLAGS="$LDFLAGS -L$SDK_PATH/usr/lib -framework Foundation -framework CoreFoundation -framework UIKit"
-            LDFLAGS="$LDFLAGS -L$SDK_PATH/System/Library/Frameworks/IOKit.framework/Versions/A"
+            CPPFLAGS="$CPPFLAGS -isysroot $SDK_PATH"
+            LDFLAGS="$LDFLAGS -framework Foundation -framework CoreFoundation -framework UIKit -lobjc"
+            LDFLAGS="$LDFLAGS -L$SDK_PATH/System/Library/Frameworks/IOKit.framework/Versions/A -lIOKit"
             LDFLAGS="$LDFLAGS $SDK_PATH/System/Library/PrivateFrameworks/BluetoothManager.framework/BluetoothManager"
-            LDFLAGS="$LDFLAGS -lIOKit -lobjc"
 
             BTSTACK_LIB_LDFLAGS="-dynamiclib -install_name \$(prefix)/lib/libBTstack.dylib"
             BTSTACK_LIB_EXTENSION="dylib"