diff --git a/Makefile b/Makefile
index f05ee0a..23021c7 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ native: jni-header snappy-header $(NATIVE_DLL)
 native-nocmake: jni-header $(NATIVE_DLL)
 snappy: native $(TARGET)/$(snappy-jar-version).jar
 
-native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
+native-all: native mac64 win32 win64 native-arm linux32 linux64 linux-ppc64le
 
 $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
 	@mkdir -p $(@D)
@@ -172,7 +172,6 @@ win64: jni-header
 mac32: jni-header
 	$(MAKE) native OS_NAME=Mac OS_ARCH=x86
 
-# TODO: This command no longer works as the crossbuild docker image contains no cross compiler for Mac OS X (Darwin)
 mac64: jni-header
 	docker run -it $(DOCKER_RUN_OPTS) -v $$PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin xerial/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64
 
diff --git a/docker/Makefile b/docker/Makefile
index 257eb19..9648d2b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -6,4 +6,4 @@ centos5-image:
 	# docker push xerial/centos5-linux-x86_64:latest
 
 multiarch-crossbuild-image:
-	docker build https://github.com/multiarch/crossbuild.git -t xerial/crossbuild:latest
+	docker build https://github.com/iwasakims/crossbuild.git#fix-osxcross-cmake -t xerial/crossbuild:latest