diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index d8b3ac7714..e9e2ddab34 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -656,12 +656,16 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_OPTIMIZATION_LEVEL = 2;
+				GCC_ENABLE_PASCAL_STRINGS = NO;
+				GCC_FAST_MATH = YES;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					RELEASE,
 					_RELEASE,
 					TARGET_OS_IPHONE,
 				);
+				GCC_THUMB_SUPPORT = NO;
+				GCC_UNROLL_LOOPS = YES;
 				GCC_VERSION = 4.2;
 				HEADER_SEARCH_PATHS = (
 					../../3party/protobuf,
diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf
index 70453c8827..cac71b9496 100644
--- a/tools/mkspecs/iphonedevice-g++42/qmake.conf
+++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf
@@ -65,15 +65,15 @@ QMAKE_CFLAGS		          += --sysroot=$$IPHONE_SDK_PATH
 QMAKE_CFLAGS		          += -isystem $$IPHONE_SDK_PATH/usr/include 
 QMAKE_CFLAGS		          += -iwithsysroot $$IPHONE_SDK_PATH  
 #QMAKE_CFLAGS              += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/
-QMAKE_CFLAGS              += -fmessage-length=0	-fpascal-strings
-QMAKE_CFLAGS              += -pipe -miphoneos-version-min=3.1 -mthumb -dead_strip
+QMAKE_CFLAGS              += -fmessage-length=0	-mno-thumb -marm
+QMAKE_CFLAGS              += -pipe -miphoneos-version-min=3.1 -dead_strip
 QMAKE_CFLAGS_DEPS         += -M
 QMAKE_CFLAGS_WARN_ON      += -Wall -W
 QMAKE_CFLAGS_WARN_OFF     += -w
 QMAKE_CFLAGS_RELEASE      += -O3
 QMAKE_CFLAGS_DEBUG        += -g
-QMAKE_CFLAGS_SHLIB        += -fPIC
-QMAKE_CFLAGS_STATIC_LIB   += -fPIC
+QMAKE_CFLAGS_SHLIB        += 
+QMAKE_CFLAGS_STATIC_LIB   += 
 QMAKE_CFLAGS_YACC         += -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_HIDESYMS     += -fvisibility=hidden
 QMAKE_CFLAGS_PRECOMPILE   += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}