diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 0951a37184c5..de10857d8800 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -18,8 +18,7 @@ case "$host" in
 	;;
 *-darwin*)
 	PACKAGER=brew
-	brew install automake
-	exit 0
+	PACKAGES="automake"
 	;;
 *)
 	PACKAGER=apt
@@ -30,8 +29,6 @@ TARGETS=$@
 INSTALL_FIDO_PPA="no"
 export DEBIAN_FRONTEND=noninteractive
 
-#echo "Setting up for '$TARGETS'"
-
 set -ex
 
 if [ -x "`which lsb_release 2>&1`" ]; then
@@ -57,6 +54,7 @@ for flag in $CONFIGFLAGS; do
     esac
 done
 
+echo "Setting up for '$TARGETS'"
 for TARGET in $TARGETS; do
     case $TARGET in
     default|without-openssl|without-zlib|c89)
@@ -87,7 +85,9 @@ for TARGET in $TARGETS; do
 	esac
         ;;
     *pam)
-        PACKAGES="$PACKAGES libpam0g-dev"
+	case "$PACKAGER" in
+	apt)	PACKAGES="$PACKAGES libpam0g-dev" ;;
+	esac
         ;;
     sk)
         INSTALL_FIDO_PPA="yes"
@@ -156,6 +156,13 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
 		PACKAGES=""
 	fi
 	;;
+    brew)
+	if [ ! -z "PACKAGES" ]; then
+		if brew install $PACKAGES; then
+			PACKAGES=""
+		fi
+	fi
+	;;
     setup)
 	if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
 		PACKAGES=""