diff --git a/.travis.yml b/.travis.yml
index 0256e837..d1b2e4e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ matrix:
   include:
     - compiler: clang
       os: osx
+      osx_image: xcode9.4
       env: DO_PUSH_ARTIFACT=yes
     - compiler: gcc
       os: linux
diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index fb9979c1..a5f4e871 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -103,7 +103,7 @@ osacompile -o "$BUILDPATH/target/Applications/OpenSC Notify.app" "MacOSX/OpenSC_
 
 
 # Build OpenSC.tokend when XCode version < 10
-if (( xcodebuild -version | sed -En 's/Xcode[[:space:]]+([0-9]+)\.[0-9]*/\1/p' < 10 )); then
+if (( $(xcodebuild -version | sed -En 's/Xcode[[:space:]]+([0-9]+)(\.[0-9]*)*/\1/p') < 10 )); then
 	# Check out OpenSC.tokend, if not already fetched.
 	if ! test -e OpenSC.tokend; then
 		git clone http://github.com/OpenSC/OpenSC.tokend.git