diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index edb2c18..895c327 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
             -   name: Upload binary artifact
                 uses: actions/upload-artifact@v4
                 with:
-                    name: mutool_${{ matrix.os }}_${{ matrix.arch }}
+                    name: mutool_${{ matrix.os == 'ubuntu-latest' && 'linux' || 'darwin' }}_${{ matrix.arch }}
                     # path: bin/mutool_${{ matrix.os }}*
                     path: bin/mutool*
 
diff --git a/build-mupdf.sh b/build-mupdf.sh
index b62bdd3..a35944b 100755
--- a/build-mupdf.sh
+++ b/build-mupdf.sh
@@ -13,22 +13,29 @@ cd mupdf-$VERSION-source || exit
 if [[ "$OS" == "linux" ]]; then
     if [[ "$ARCH" == "x86_64" ]]; then
         export CC="gcc"
-        export CFLAGS="-m64"
+        export XCFLAGS="-m64"
     elif [[ "$ARCH" == "arm64" ]]; then
         export CC="aarch64-linux-gnu-gcc"
+        export CXX="aarch64-linux-gnu-g++"
+        export XCFLAGS="-march=armv8-a"
     fi
     make HAVE_X11=no HAVE_GLUT=no prefix=../. install
 else
     if [[ "$ARCH" == "x86_64" ]]; then
         export CC="clang"
+        export CXX="clang++"
         export XCFLAGS="-arch x86_64"
-        export XLDFLAGS="-L/usr/local/lib -lX11 -lGL"
+        export XLDFLAGS="-L/opt/X11/lib -lX11 -framework OpenGL"
+        export XCXXFLAGS="-v"
     elif [[ "$ARCH" == "arm64" ]]; then
         export CC="clang"
+        export CXX="clang++"
         export XCFLAGS="-arch arm64"
-        export XLDFLAGS="-L/usr/local/lib -lX11 -lGL"
+        export XLDFLAGS="-L/opt/X11/lib -lX11 -framework OpenGL"
+        export XCXXFLAGS="-v"
     fi
-    make HAVE_X11=no HAVE_GLUT=no prefix=../. install
+    ps aux | grep XQuartz
+    make prefix=../. install
 fi
 
 cd ..