diff --git a/Formula/btfs-mac.rb b/Formula/btfs-mac.rb
index 0c2d9ec..d8fbeae 100644
--- a/Formula/btfs-mac.rb
+++ b/Formula/btfs-mac.rb
@@ -3,10 +3,9 @@ require_relative "../require/macfuse"
 class BtfsMac < Formula
   desc "BitTorrent filesystem based on FUSE"
   homepage "https://github.com/johang/btfs"
-  url "https://github.com/johang/btfs/archive/refs/tags/v2.24.tar.gz"
-  sha256 "d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935"
+  url "https://github.com/johang/btfs/archive/refs/tags/v3.1.tar.gz"
+  sha256 "c363f04149f97baf1c5e10ac90677b8309724f2042ab045a45041cfb7b44649b"
   license "GPL-3.0-only"
-  revision 1
   head "https://github.com/johang/btfs.git", branch: "master"
 
   bottle do
@@ -23,7 +22,7 @@ class BtfsMac < Formula
   depends_on :macos
 
   def install
-    setup_fuse
+    setup_fuse3
     system "autoreconf", "--force", "--install", "--verbose"
     system "./configure", *std_configure_args, "--disable-silent-rules"
     system "make", "install"
diff --git a/require/macfuse.rb b/require/macfuse.rb
index 202c59b..9498309 100644
--- a/require/macfuse.rb
+++ b/require/macfuse.rb
@@ -100,19 +100,20 @@ class Formula
   end
 
   def setup_fuse_flags
-    ENV.append "CFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CFLAGS", "-I#{alt_fuse_root}/include/fuse"
+    ENV.append "CFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
-    ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include/fuse"
+    ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CPPFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CPPFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
-    ENV.append "CXXFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CXXFLAGS", "-I#{alt_fuse_root}/include/fuse"
+    ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CXXFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CXXFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
     ENV.append "LDFLAGS", "-L#{alt_fuse_root}/lib"
+    ENV.append "CGO_CPPFLAGS", "-I#{alt_fuse_root}/include/fuse"
     ENV.append "CGO_CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CGO_CPPFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CGO_CPPFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
@@ -125,16 +126,20 @@ class Formula
 
   def setup_fuse3_flags
     ENV.append "CFLAGS", "-I#{alt_fuse_root}/include/fuse3"
+    ENV.append "CFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
     ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include/fuse3"
+    ENV.append "CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CPPFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CPPFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
     ENV.append "CXXFLAGS", "-I#{alt_fuse_root}/include/fuse3"
+    ENV.append "CXXFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CXXFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CXXFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
     ENV.append "LDFLAGS", "-L#{alt_fuse_root}/lib"
     ENV.append "CGO_CPPFLAGS", "-I#{alt_fuse_root}/include/fuse3"
+    ENV.append "CGO_CPPFLAGS", "-I#{alt_fuse_root}/include"
     ENV.append "CGO_CPPFLAGS", "-D_FILE_OFFSET_BITS=64"
     ENV.append "CGO_CPPFLAGS", "-D_USE_FILE_OFFSET_BITS=64"
     ENV.append "CGO_LDFLAGS", "-L#{alt_fuse_root}/lib"