diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index 1f6aa4f..5b2645c 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -62,7 +62,7 @@ jobs:
         if [ "$RUNNER_OS" = Linux ]; then
             sudo apt-get -y install meson ninja-build
         else
-            brew install meson
+            brew install meson autoconf automake libtool
         fi
 
     - name: configure
@@ -90,5 +90,3 @@ jobs:
       run: ninja -C builddir
     - name: check
       run: meson test -C builddir
-    - name: distcheck
-      run: meson dist -C builddir
diff --git a/bootstrap.sh b/bootstrap.sh
index d470839..b437c4b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-# ensure m4 dir exists 
+# if running from `meson dist`, make sure we run from the dist root
+if [ -n "$MESON_PROJECT_DIST_ROOT" ]; then
+    cd "$MESON_PROJECT_DIST_ROOT"
+# meson < 0.58
+elif [ -n "$MESON_DIST_ROOT" ]; then
+    cd "$MESON_DIST_ROOT"
+fi
+
+# ensure m4 dir exists
 mkdir -p m4
 # ensure build-aux exists
 mkdir -p build-aux
diff --git a/meson.build b/meson.build
index c40531b..a788126 100644
--- a/meson.build
+++ b/meson.build
@@ -39,3 +39,5 @@ import('pkgconfig').generate(
     name: 'Erfa',
     description: 'Essential Routines for Fundamental Astronomy',
 )
+
+meson.add_dist_script('./bootstrap.sh')