diff --git a/manifest/armv7l/f/fzf.filelist b/manifest/armv7l/f/fzf.filelist
index eec52dc4a..07dfe8bb6 100644
--- a/manifest/armv7l/f/fzf.filelist
+++ b/manifest/armv7l/f/fzf.filelist
@@ -1 +1,6 @@
+# Total size: 4364563
 /usr/local/bin/fzf
+/usr/local/bin/fzf-tmux
+/usr/local/etc/bash.d/10-fzf
+/usr/local/share/man/man1/fzf-tmux.1.zst
+/usr/local/share/man/man1/fzf.1.zst
diff --git a/manifest/i686/f/fzf.filelist b/manifest/i686/f/fzf.filelist
new file mode 100644
index 000000000..e00fbdb3d
--- /dev/null
+++ b/manifest/i686/f/fzf.filelist
@@ -0,0 +1,6 @@
+# Total size: 4232723
+/usr/local/bin/fzf
+/usr/local/bin/fzf-tmux
+/usr/local/etc/bash.d/10-fzf
+/usr/local/share/man/man1/fzf-tmux.1.zst
+/usr/local/share/man/man1/fzf.1.zst
diff --git a/manifest/x86_64/f/fzf.filelist b/manifest/x86_64/f/fzf.filelist
index eec52dc4a..cdba93018 100644
--- a/manifest/x86_64/f/fzf.filelist
+++ b/manifest/x86_64/f/fzf.filelist
@@ -1 +1,6 @@
+# Total size: 4619563
 /usr/local/bin/fzf
+/usr/local/bin/fzf-tmux
+/usr/local/etc/bash.d/10-fzf
+/usr/local/share/man/man1/fzf-tmux.1.zst
+/usr/local/share/man/man1/fzf.1.zst
diff --git a/packages/fzf.rb b/packages/fzf.rb
index c7385dfbf..5490b61f9 100644
--- a/packages/fzf.rb
+++ b/packages/fzf.rb
@@ -3,23 +3,39 @@ require 'package'
 class Fzf < Package
   description 'A command-line fuzzy finder'
   homepage 'https://github.com/junegunn/fzf'
-  version '0.62.0'
+  version '0.65.2'
   license 'MIT and BSD-with-disclosure'
-  compatibility 'aarch64 armv7l x86_64'
-  source_url({
-    aarch64: "https://github.com/junegunn/fzf/releases/download/v#{version}/fzf-#{version}-linux_armv7.tar.gz",
-     armv7l: "https://github.com/junegunn/fzf/releases/download/v#{version}/fzf-#{version}-linux_armv7.tar.gz",
-     x86_64: "https://github.com/junegunn/fzf/releases/download/v#{version}/fzf-#{version}-linux_amd64.tar.gz"
-  })
-  source_sha256({
-    aarch64: 'fee57a3c3e19540e9830efd4995e7e132abbf995118c451a038bb36c5975b925',
-     armv7l: 'fee57a3c3e19540e9830efd4995e7e132abbf995118c451a038bb36c5975b925',
-     x86_64: '64b56dd484a2317d5f04c28ac0791b36807f034adb419209ad39fb6637255794'
+  compatibility 'all'
+  source_url 'https://github.com/junegunn/fzf.git'
+  git_hashtag "v#{version}"
+  binary_compression 'tar.zst'
+
+  binary_sha256({
+    aarch64: '7c1302551850b79feab7468786c86d5635277c77de1d9cd6bacaa75b908d58df',
+     armv7l: '7c1302551850b79feab7468786c86d5635277c77de1d9cd6bacaa75b908d58df',
+       i686: '3068b03c1dd69895427a8f1488f5dd122e9f412658bcfcf3cc07658bcd2c8d6a',
+     x86_64: '9d64ecaa28b54b344416129235e3ec96ed14e9211eeeee1d272a1f8bf0e0ce7f'
   })
 
-  no_compile_needed
+  depends_on 'glibc' # R
+  depends_on 'go' => :build
+  depends_on 'tmux' # R - Needed for tmux integration
+
+  print_source_bashrc
+
+  def self.build
+    File.write '10-fzf', <<~EOF
+      # Set up fzf key bindings and fuzzy completion
+      eval "$(fzf --bash)"
+    EOF
+    system 'go build -o bin/fzf'
+  end
 
   def self.install
-    FileUtils.install 'fzf', "#{CREW_DEST_PREFIX}/bin/fzf", mode: 0o755
+    FileUtils.install 'bin/fzf', "#{CREW_DEST_PREFIX}/bin/fzf", mode: 0o755
+    FileUtils.install 'bin/fzf-tmux', "#{CREW_DEST_PREFIX}/bin/fzf-tmux", mode: 0o755
+    FileUtils.install 'man/man1/fzf.1', "#{CREW_DEST_MAN_PREFIX}/man1/fzf.1", mode: 0o644
+    FileUtils.install 'man/man1/fzf-tmux.1', "#{CREW_DEST_MAN_PREFIX}/man1/fzf-tmux.1", mode: 0o644
+    FileUtils.install '10-fzf', "#{CREW_DEST_PREFIX}/etc/bash.d/10-fzf", mode: 0o644
   end
 end