diff --git a/.gitignore b/.gitignore
index e3c9fa4..461c1c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ jreout
 ios-missing-include/cups
 ios-missing-include/X11
 ios-missing-include/Xm
+dizout
+jreout
+jdkout
diff --git a/buildjdk.sh b/buildjdk.sh
index 74fa6d9..9cf7d11 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -47,7 +47,7 @@ else
   export CFLAGS+=" $sameflags"
   export CXXFLAGS="$sameflags"
 
-  HOMEBREW_NO_AUTO_UPDATE=1 brew install xquartz
+  HOMEBREW_NO_AUTO_UPDATE=1 brew install ldid xquartz
 fi
 
 # fix building libjawt
diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index fd7df82..90c9557 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -1,19 +1,20 @@
 #!/bin/bash
 set -e
-rm -rf jreout || true
 
-if [ "$TARGET_JDK" == "arm" ]
-then
+if [ "$TARGET_JDK" == "arm" ]; then
   export TARGET_JDK=aarch32
 fi
 
 imagespath=openjdk/build/${JVM_PLATFORM}-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images
 
+rm -rf dizout jreout jdkout
 mkdir dizout
 
 if [ "$BUILD_IOS" == "1" ]; then
-  find $imagespath -name "*.dylib" -exec ldid -S ios-sign-entitlements.xml {} \;
-  find $imagespath -name "bin" -exec ldid -S ios-sign-entitlements.xml {}/* \;
+  find $imagespath -name "*.dylib" -exec ldid -Sios-sign-entitlements.xml {} \;
+  for bindir in $(find $imagespath -name "bin"); do
+    ldid -Sios-sign-entitlements.xml ${bindir}/*
+  done
 fi
 
 cp -r $imagespath/j2re-image jreout