diff --git a/apache-arrow b/apache-arrow
index ce69d9c339..e3e68866f9 100644
--- a/apache-arrow
+++ b/apache-arrow
@@ -1,6 +1,6 @@
-# We have bundles for 2.0.0 and 3.0.0 now
-if [ "$VERSION" != "2.0.0" ]; then
-VERSION="3.0.0"
+# We have bundles for 2.0.0 and 3.0.0 and 4.0.0 now
+if [ "$VERSION" != "2.0.0" ] && [ "$VERSION" != "3.0.0" ]; then
+VERSION="4.0.0"
 fi
 
 # Find a bundle
@@ -29,7 +29,11 @@ rm -f libs.tar.xz
 
 # Hardcoded flags
 AWS_LIBS="-laws-cpp-sdk-config -laws-cpp-sdk-transfer -laws-cpp-sdk-identity-management -laws-cpp-sdk-cognito-identity -laws-cpp-sdk-sts -laws-cpp-sdk-s3 -laws-cpp-sdk-core -laws-c-event-stream -laws-checksums -laws-c-common -lpthread -lcurl"
-PKG_LIBS="-L$BREWDIR/lib -lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS"
+PKG_LIBS="-lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS"
+PKG_DIRS="-L$BREWDIR/lib"
+if [ "$VERSION" = "3.0.0" ] || [ "$VERSION" = "2.0.0" ]; then
+  PKG_LIBS="$PKG_DIRS $PKG_LIBS"
+fi
 PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3"
 
 # Cleanup