diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk
index 2ceac8a0a..562d1869d 100644
--- a/submodules/build/builders.d/libvpx.mk
+++ b/submodules/build/builders.d/libvpx.mk
@@ -41,7 +41,7 @@ clean-libvpx:
 veryclean-libvpx:
 	-cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean
 	cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
-	&& git checkout build/make/configure.sh configure\
+	&& git clean -f && git reset --hard \
 	&& rm -f patched.stamp 
 	rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir)
 
diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch
index d36f2be87..7824f7f11 100644
--- a/submodules/build/builders.d/libvpx.patch
+++ b/submodules/build/builders.d/libvpx.patch
@@ -13,10 +13,10 @@ index c99a01c..f7f54c6 100755
 -            AS=${TOOLCHAIN_PATH}/as
 -            STRIP=${TOOLCHAIN_PATH}/strip
 -            NM=${TOOLCHAIN_PATH}/nm
-+            CXX=`xcrun --find g++`
-+            CC=`xcrun --find gcc`
++            CXX=`xcrun --find clang++`
++            CC=`xcrun --find clang`
 +            AR=`xcrun --find ar`
-+            LD=`xcrun --find ld`
++            LD=`xcrun --find clang`
 +            AS=`xcrun --find as`
 +            STRIP=`xcrun --find strip`
 +            NM=`xcrun --find nm`
diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk
index e84bed136..8937c8d01 100644
--- a/submodules/build/builders.d/x264.mk
+++ b/submodules/build/builders.d/x264.mk
@@ -44,7 +44,7 @@ $(BUILDER_SRC_DIR)/$(x264_dir)/patched:
 	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
 	&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
 
-$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: 
+$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched
 	mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir)
 	cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
 	&& rsync -rvLpgoc --exclude ".git"  $(BUILDER_SRC_DIR)/$(x264_dir)/* . 
@@ -52,12 +52,12 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/configure:
 $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/configure
 	cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
 	&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&& CC="$$CC" ./configure --prefix=$(prefix)  $(x264-configure-option)
+	&& CC="$$CC" STRINGS="$$STRINGS" ./configure --prefix=$(prefix)  $(x264-configure-option)
 
 build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak
 	cd $(BUILDER_BUILD_DIR)/$(x264_dir) \
 	&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&& make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" && make STRIP="$$STRIP" AR="$$AR"  RANLIB="$$RANLIB" install
+	&& make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" STRINGS="$$STRINGS" && make STRIP="$$STRIP" AR="$$AR"  RANLIB="$$RANLIB"  STRINGS="$$STRINGS" install
 
 clean-x264:
 	cd  $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean
@@ -65,7 +65,7 @@ clean-x264:
 veryclean-x264:
 	-cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean
 	cd $(BUILDER_SRC_DIR)/$(x264_dir)/ \
-	&& git checkout common/arm/asm.S \
+	&& git clean -f && git reset --hard \
 	&& rm -f patched
 	rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir)
 
diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk
index f41b2f5d6..4a9ae96c7 100644
--- a/submodules/build/builders.d/zrtp.mk
+++ b/submodules/build/builders.d/zrtp.mk
@@ -4,7 +4,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
 	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\
         && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
         && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake  \
-	-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find gcc` -DCMAKE_CXX_COMPILER=`xcrun --find g++` \
+	-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` \
 	-DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \
 	-DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON "
 # Used toolchain: $(TC)
@@ -12,7 +12,9 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
 
 build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile
 	@echo "Build ZRTP - prefix $(prefix)"
-	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make VERBOSE=1 && make install
+	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) \
+	&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
+	&& make VERBOSE=1 && make install
 
 clean-zrtpcpp:
 	-cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean