diff --git a/build.sh b/build.sh
index 53b5b68..71fea87 100755
--- a/build.sh
+++ b/build.sh
@@ -83,7 +83,7 @@ do
 	export CFLAGS
 	export LDFLAGS
 	
-    export CXXCPP="$PLATFORM/Developer/usr/bin/llvm-cpp"
+    export CXXCPP="$PLATFORM/Developer/usr/bin/llvm-cpp-4.2"
     export CPP="$CXXCPP"
     export CXX="$PLATFORM/Developer/usr/bin/llvm-g++"
     export CC="$PLATFORM/Developer/usr/bin/llvm-gcc"
@@ -101,6 +101,7 @@ do
 		--enable-static=yes \
 		--enable-shared=no \
 	    --disable-doc \
+		--disable-rtcd \
 		${EXTRA_FLAGS}
 
     echo "Installing opus for $ARCH..."
diff --git a/sync.sh b/sync.sh
index a6a94b5..7e9a451 100755
--- a/sync.sh
+++ b/sync.sh
@@ -9,7 +9,7 @@ DIST_DIR_BASE=${DIST_DIR_BASE:="$SCRIPT_DIR/dist"}
 
 git submodule update --init opus
 cd opus
-git checkout ${OPUS_VER}
+git checkout master
 git pull 
 cd ..