diff --git a/flake.lock b/flake.lock
index f4e01057..fbcfb39f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,17 +21,17 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 9a0502da..34123959 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,16 +13,13 @@
 
     # keep-sorted start block=yes newline_separated=yes
     base16-fish = {
-      # Lock the base16-fish input to a custom patch [2] ("Make autosuggestion
-      # and comment base03"), since it is currently impossible to apply patches
+      # Lock the base16-fish input to a custom patchset that cherry-picks
+      # pending patches [2], since it is currently impossible to apply patches
       # to flake inputs [1] ("Support flake references to patches").
       #
-      # Once this single-patch approach no longer scales, the repository should
-      # be properly forked, if [2] has still not been merged.
-      #
       # [1]: https://github.com/NixOS/nix/issues/3920
-      # [2]: https://github.com/tomyun/base16-fish/pull/12
-      url = "github:tomyun/base16-fish/23ae20a0093dca0d7b39d76ba2401af0ccf9c561";
+      # [2]: https://github.com/tomyun/base16-fish/pull/16
+      url = "github:tomyun/base16-fish/86cbea4dca62e08fb7fd83a70e96472f92574782";
       flake = false;
     };