diff --git a/configure.ac b/configure.ac
index 8c5e7c5b4fc8088e59cc2731e799d255265362bd..513d2d14635244611aff15907ad19f68b1e98a66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ case "${host_os}" in
     dnl Force gcc "-arch" flag
     ARCH_flag=""
     case "${host}" in
-      i386*)
+      i*86*)
         ARCH_flag="-arch i386"
       ;;
       ppc64*)
diff --git a/extras/macosx/build-vlc.sh b/extras/macosx/build-vlc.sh
index dfe4e9cf611986e50317e6dda5f9b6d40f3a3749..a154b17c0665c069da045e355f58aed8aed13007 100755
--- a/extras/macosx/build-vlc.sh
+++ b/extras/macosx/build-vlc.sh
@@ -137,13 +137,13 @@ cd 64build
         --enable-flac \
         --enable-theora \
         --enable-shout \
-        --enable-ncurses \
-        --enable-twolame \
+        --disable-ncurses \
+        --disable-twolame \
         --enable-realrtsp \
         --enable-libass \
         --enable-macosx-audio \
         --disable-macosx-eyetv \
-        --disable-macosx-qtkit \
+        --enable-macosx-qtkit \
         --enable-macosx-vout \
         --disable-skins2 \
         --disable-xcb \
@@ -157,7 +157,8 @@ cd 64build
         --disable-sdl \
         --disable-sdl-image \
         --disable-macosx-vlc-app \
-	    --with-macosx-sdk=$SDKROOT \
+        --disable-dirac \
+	--with-macosx-sdk=$SDKROOT \
         --with-macosx-version-min=10.6 \
         --prefix=${PREFIX} > ${out}
 
@@ -244,6 +245,7 @@ antiflicker
 anaglyph
 remap
 bluray
+x264
 "
 
 for i in ${blacklist}