diff --git a/.gitattributes b/.gitattributes
index e1623b7a0..b7898d9ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,6 +23,7 @@ LICENSE-binary export-ignore
 NOTICE-binary export-ignore
 assets/slides/* export-ignore
 assets/diagram/* export-ignore
+assets/img/* export-ignore
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.java text eol=lf
diff --git a/build/make-distribution.sh b/build/make-distribution.sh
index 998597b02..ce0564471 100755
--- a/build/make-distribution.sh
+++ b/build/make-distribution.sh
@@ -256,5 +256,9 @@ TARDIR_NAME="apache-celeborn-$VERSION-$NAME"
 TARDIR="$PROJECT_DIR/$TARDIR_NAME"
 rm -rf "$TARDIR"
 cp -R "$DIST_DIR" "$TARDIR"
-tar czf "apache-celeborn-$VERSION-$NAME.tgz" -C "$PROJECT_DIR" "$TARDIR_NAME"
+TAR="tar"
+if [ "$(uname -s)" = "Darwin" ]; then
+  TAR="tar --no-mac-metadata --no-xattrs"
+fi
+$TAR -czf "apache-celeborn-$VERSION-$NAME.tgz" -C "$PROJECT_DIR" "$TARDIR_NAME"
 rm -rf "$TARDIR"