diff --git a/default/templates/base.tpl b/default/templates/base.tpl
index a0d092f2a..cfbff4e25 100644
--- a/default/templates/base.tpl
+++ b/default/templates/base.tpl
@@ -34,6 +34,7 @@
   <apply template="/templates/hooks/more-head" />
 
   <head-main />
+  <apply template="components/stork/stork-search-head" />
 </head>
 
 <!-- DoNotFormat -->
@@ -44,6 +45,7 @@
 
 <body class="${bodyClass}">
   <body-main />
+  <apply template="components/stork/stork-search" />
 </body>
 
 </html>
\ No newline at end of file
diff --git a/default/templates/components/breadcrumbs.tpl b/default/templates/components/breadcrumbs.tpl
index 0bf79750f..1f64e6dce 100644
--- a/default/templates/components/breadcrumbs.tpl
+++ b/default/templates/components/breadcrumbs.tpl
@@ -25,6 +25,10 @@
         </ema:breadcrumbs>
       </ul>
     </div>
+    <button class="inline px-2 py-1 bg-gray-50 outline-none cursor-pointer focus:outline-none"
+      title="Search (Ctrl+K)" type="button" onclick="toggleSearch()">
+      <apply template="stork/stork-icon" />
+    </button>
     <button
       class="inline px-2 py-1 text-white bg-${theme}-600 outline-none cursor-pointer focus:outline-none"
       title="Toggle sidebar" type="button" onclick="toggleHidden('sidebar')">
diff --git a/default/templates/components/stork/stork-icon.tpl b/default/templates/components/stork/stork-icon.tpl
new file mode 100644
index 000000000..476771c8a
--- /dev/null
+++ b/default/templates/components/stork/stork-icon.tpl
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="width: 1rem;" class="hover:text-${theme}-700" f
+  fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+  <path stroke-linecap="round" stroke-linejoin="round"
+    d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+</svg>
\ No newline at end of file
diff --git a/default/templates/components/stork/stork-search-head.tpl b/default/templates/components/stork/stork-search-head.tpl
new file mode 100644
index 000000000..18de8c2bc
--- /dev/null
+++ b/default/templates/components/stork/stork-search-head.tpl
@@ -0,0 +1,63 @@
+<link rel="stylesheet" href="https://files.stork-search.net/releases/v1.5.0/flat.css" />
+<!-- Custom Stork-search styling for Emanote -->
+<style>
+  #stork-search-container {
+    z-index: 1000;
+    background-color: rgb(15 23 42/.8);
+  }
+
+  .stork-overflow-hidden-important {
+    overflow: hidden !important;
+  }
+</style>
+
+
+<script src="https://files.stork-search.net/releases/v1.5.0/stork.js"></script>
+<ema:metadata>
+  <with var="template">
+    <script data-emanote-base-url="${value:baseUrl}">
+      window.emanote = {};
+      window.emanote.stork = {
+        searchShown: false,
+        toggleSearch: function () {
+          document.getElementById('stork-search-container').classList.toggle('hidden');
+          window.emanote.stork.searchShown = document.body.classList.toggle('stork-overflow-hidden-important');
+          if (window.emanote.stork.searchShown) {
+            document.getElementById('stork-search-input').focus();
+          }
+        },
+        clearSearch: function () {
+          document.getElementById('stork-search-container').classList.add('hidden');
+          document.body.classList.remove('stork-overflow-hidden-important');
+          window.emanote.stork.searchShown = false;
+        },
+
+        init: function () {
+          const indexName = 'emanote-search'; // used to match input[data-stork] attribute value
+          const baseUrl = document.currentScript.getAttribute('data-emanote-base-url') || '/';
+          const indexUrl = baseUrl + '-/stork.st';
+          if (document.readyState !== 'complete') {
+            window.addEventListener('load', function () {
+              stork.register(indexName, indexUrl);
+            });
+
+            document.addEventListener('keydown', event => {
+              if (window.emanote.stork.searchShown && event.key === 'Escape') {
+                window.emanote.stork.clearSearch();
+                event.preventDefault();
+              } else if ((event.key == 'k' || event.key == 'K') && (event.ctrlKey || event.metaKey)) {
+                window.emanote.stork.toggleSearch();
+                event.preventDefault();
+              }
+            });
+          } else {
+            // Override existing on Ema's hot-reload
+            stork.register(indexName, indexUrl, { forceOverwrite: true });
+          }
+        }
+      };
+
+      window.emanote.stork.init();
+    </script>
+  </with>
+</ema:metadata>
\ No newline at end of file
diff --git a/default/templates/components/stork/stork-search.tpl b/default/templates/components/stork/stork-search.tpl
new file mode 100644
index 000000000..14c0f5e26
--- /dev/null
+++ b/default/templates/components/stork/stork-search.tpl
@@ -0,0 +1,12 @@
+<div id="stork-search-container"
+  class="hidden fixed w-screen h-screen inset-0 backdrop-filter backdrop-blur-sm">
+  <div class="fixed w-screen h-screen inset-0" onclick="window.emanote.stork.toggleSearch()"></div>
+
+  <div class="container mx-auto p-10 mt-10">
+    <div class="stork-wrapper-flat container mx-auto">
+      <input id="stork-search-input" data-stork="emanote-search" class="stork-input"
+        placeholder="Search (Ctrl+K) ..." />
+      <div data-stork="emanote-search-output" class="stork-output"></div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/default/templates/layouts/book.tpl b/default/templates/layouts/book.tpl
index 45f805202..cb443051e 100644
--- a/default/templates/layouts/book.tpl
+++ b/default/templates/layouts/book.tpl
@@ -11,7 +11,6 @@
         <nav id="sidebar"
           class="flex-shrink hidden leading-relaxed md:block md:sticky md:top-0 md:h-full md:w-48 xl:w-64">
           <div class="px-2 py-2 text-gray-800">
-
             <div id="indexing-links" class="flex flex-row float-right p-2 space-x-2 text-gray-500">
               <a href="${ema:tagIndexUrl}" title="View tags">
                 <svg style="width: 1rem;" class="hover:text-${theme}-700" fill="none"
@@ -29,6 +28,10 @@
                   </path>
                 </svg>
               </a>
+              <a title="Search (Ctrl+K)" class="cursor-pointer"
+                onclick="window.emanote.stork.toggleSearch()">
+                <apply template="components/stork/stork-icon" />
+              </a>
             </div>
 
             <div id="site-logo" class="pl-2">
diff --git a/default/templates/layouts/note.tpl b/default/templates/layouts/note.tpl
index ca301e626..1932231f7 100644
--- a/default/templates/layouts/note.tpl
+++ b/default/templates/layouts/note.tpl
@@ -12,7 +12,15 @@
     <div class="${containerClass}">
       <div class="mt-2 md:mt-4">
         <apply template="components/note-uptree" />
-        <div class="md:shadow-2xl md:mb-8">
+
+        <div class="relative md:shadow-2xl md:mb-8">
+
+          <div class="absolute -top-6 right-1 md:right-0 flex flex-row items-center justify-center">
+            <a title="Search (Ctrl+K)" class="cursor-pointer"
+              onclick="window.emanote.stork.toggleSearch()">
+              <apply template="components/stork/stork-icon" />
+            </a>
+          </div>
           <div class="flex-1 w-full overflow-x-auto bg-white">
             <main class="px-4 py-4">
               <apply template="components/note-title" />
diff --git a/docs/guide/search.md b/docs/guide/search.md
new file mode 100644
index 000000000..1c027febc
--- /dev/null
+++ b/docs/guide/search.md
@@ -0,0 +1,5 @@
+# Full-text search
+
+Emanote provides client-side full-text search using [Stork](https://stork-search.net/)[^1]. The keyboard shortcut `Ctrl+K` (or `⌘K` on macOS) can be used to access the search input. Search should work in both live server and the statically generated site.
+
+[^1]: The Stork index file can be accessed at [`-/stork.st`](-/stork.st). 
\ No newline at end of file
diff --git a/emanote.cabal b/emanote.cabal
index 94c60e79d..b63e068e4 100644
--- a/emanote.cabal
+++ b/emanote.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               emanote
-version:            0.6.23.1
+version:            0.7.0.0
 license:            AGPL-3.0-only
 copyright:          2021 Sridhar Ratnakumar
 maintainer:         srid@srid.ca
@@ -103,7 +103,7 @@ common library-common
     , data-default
     , dependent-sum
     , directory
-    , ema                    >=0.7.2
+    , ema                    >=0.8
     , filepath
     , filepattern
     , fsnotify
@@ -126,15 +126,18 @@ common library-common
     , pandoc-types
     , parsec
     , path-tree              >=0.2
+    , process-extras
     , profunctors
     , relude                 >=1.0
     , shower
     , some
+    , stm
     , tagged
     , tagtree
     , tailwind               >=0.3
     , text
     , time
+    , tomland
     , unionmount             >=0.2
     , unliftio
     , unordered-containers
@@ -167,6 +170,8 @@ library
     Emanote.Model.QuerySpec
     Emanote.Model.SData
     Emanote.Model.StaticFile
+    Emanote.Model.Stork
+    Emanote.Model.Stork.Index
     Emanote.Model.Task
     Emanote.Model.Title
     Emanote.Model.Type
diff --git a/flake.lock b/flake.lock
index 9f9afc7f8..e9621af06 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "ema": {
       "flake": false,
       "locked": {
-        "lastModified": 1659891375,
-        "narHash": "sha256-UDI8AACQf84Mc8V//6KeTGj9Djlsj291gDslHMEIX48=",
+        "lastModified": 1660941244,
+        "narHash": "sha256-gGhvmSjjr07u8uWaBIv6F5WE+VCGngSVXN9mhb4BmQo=",
         "owner": "srid",
         "repo": "ema",
-        "rev": "b052ad1b2f5d483ff3ed3b664df8ce419345d852",
+        "rev": "d74daa4d0d1f7a14cebd415787166fe7909fc33b",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "haskell-flake": {
       "locked": {
-        "lastModified": 1654001497,
-        "narHash": "sha256-GfrpyoQrVT9Z/j9its8BQs3I5O5X5Lc2IkK922bz7zg=",
+        "lastModified": 1660319056,
+        "narHash": "sha256-MX6PLEtXVyXXUEk3t1e0c20XRL4m4u9TFET2X0TpTdE=",
         "owner": "srid",
         "repo": "haskell-flake",
-        "rev": "4c0b0ff295f0b97238a600d2381c37ee46b67f9c",
+        "rev": "1ca2be3c354ef2a3296cac7e54ae21e1d6ead6d7",
         "type": "github"
       },
       "original": {
@@ -70,10 +70,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657447684,
-        "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
-        "path": "/nix/store/a885zpv9ys2p2x7qnzqvxlsy321mclip-source",
-        "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88",
+        "lastModified": 1659077768,
+        "narHash": "sha256-P0XIHBVty6WIuIrk2DZNvLcYev9956y1prT4zL212H8=",
+        "path": "/nix/store/1ha33ma070pyxw5kkcx61qi7ypzzxzah-source",
+        "rev": "2a93ea177c3d7700b934bf95adfe00c435f696b8",
         "type": "path"
       },
       "original": {
@@ -98,11 +98,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657796772,
-        "narHash": "sha256-4JD3a9frE26VjaJysyd+DIHUJUiWsx/bFrk8tsGMSpU=",
+        "lastModified": 1658431129,
+        "narHash": "sha256-AtTxP0AMXdeU0ZTJP5R1lCtx5az3ejrmGP1klEdu1qU=",
         "owner": "srid",
         "repo": "tailwind-haskell",
-        "rev": "96f4c7f8c59eb1103b75ff7d4a753d2d4b9c1ee7",
+        "rev": "09a102164b1a4559892277ff38efdc9b949c5433",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bb15a829b..3a8b3bcac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
         haskell-flake.flakeModule
         ./nix/emanote.nix
         ./nix/docker.nix
+        ./nix/stork.nix
       ];
       perSystem = { pkgs, inputs', self', ... }: {
         haskellProjects.default = {
@@ -35,6 +36,7 @@
               ormolu;
             inherit (inputs'.tailwind-haskell.packages)
               tailwind;
+            inherit (self'.packages) stork;
           };
           source-overrides = {
             inherit (inputs)
@@ -48,6 +50,8 @@
             inherit (inputs'.tailwind-haskell.packages)
               tailwind;
           };
+          modifier = drv: with pkgs.haskell.lib;
+            addBuildDepends drv [ self'.packages.stork ];
         };
         packages.test =
           pkgs.runCommand "emanote-test" { } ''
diff --git a/nix/stork.nix b/nix/stork.nix
new file mode 100644
index 000000000..bfc1d94bc
--- /dev/null
+++ b/nix/stork.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  perSystem = { system, pkgs, ... }: {
+    packages.stork =
+      # Stork is marked as broken on intel mac, but it does work.
+      # Unfortunately we cannot test this code PATH due to lack of CI for intel mac (#335).
+      if system == "x86_64-darwin" then pkgs.stork.overrideAttrs (_oa: { meta.broken = false; }) else pkgs.stork;
+  };
+}
diff --git a/src/Emanote.hs b/src/Emanote.hs
index 3ee1dbdb2..cbb642a02 100644
--- a/src/Emanote.hs
+++ b/src/Emanote.hs
@@ -50,7 +50,7 @@ instance IsRoute SiteRoute where
 instance EmaSite SiteRoute where
   type SiteArg SiteRoute = EmanoteConfig
   siteInput = emanoteSiteInput
-  siteOutput rp m r = pure $ View.emanoteSiteOutput rp m r
+  siteOutput = View.emanoteSiteOutput
 
 defaultEmanoteConfig :: CLI.Cli -> EmanoteConfig
 defaultEmanoteConfig cli =
diff --git a/src/Emanote/Model/Stork.hs b/src/Emanote/Model/Stork.hs
new file mode 100644
index 000000000..c0b209557
--- /dev/null
+++ b/src/Emanote/Model/Stork.hs
@@ -0,0 +1,30 @@
+module Emanote.Model.Stork
+  ( renderStorkIndex,
+  )
+where
+
+import Control.Monad.Logger (MonadLoggerIO)
+import Data.IxSet.Typed qualified as Ix
+import Emanote.Model.Note qualified as N
+import Emanote.Model.Stork.Index (File (File), Input (Input), readOrBuildStorkIndex)
+import Emanote.Model.Title qualified as Tit
+import Emanote.Model.Type (Model)
+import Emanote.Model.Type qualified as M
+import Emanote.Route qualified as R
+import Emanote.Source.Loc qualified as Loc
+import Optics.Core ((^.))
+import Relude
+import System.FilePath ((</>))
+
+renderStorkIndex :: (MonadIO m, MonadLoggerIO m) => Model -> m LByteString
+renderStorkIndex model = do
+  readOrBuildStorkIndex (model ^. M.modelStorkIndex) (Input $ storkFiles model)
+
+storkFiles :: Model -> [File]
+storkFiles model =
+  let baseDir = Loc.locPath . Loc.primaryLayer $ model ^. M.modelLayers
+   in Ix.toList (model ^. M.modelNotes) <&> \note ->
+        File
+          ((baseDir </>) $ R.withLmlRoute R.encodeRoute $ note ^. N.noteRoute)
+          (toText $ R.encodeRoute $ N.noteHtmlRoute note)
+          (Tit.toPlain $ note ^. N.noteTitle)
diff --git a/src/Emanote/Model/Stork/Index.hs b/src/Emanote/Model/Stork/Index.hs
new file mode 100644
index 000000000..d80f95712
--- /dev/null
+++ b/src/Emanote/Model/Stork/Index.hs
@@ -0,0 +1,104 @@
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+module Emanote.Model.Stork.Index
+  ( IndexVar,
+    newIndex,
+    clearStorkIndex,
+    readOrBuildStorkIndex,
+    File (File),
+    Input (Input),
+  )
+where
+
+import Control.Monad.Logger (MonadLoggerIO)
+import Data.Text qualified as T
+import Data.Time (NominalDiffTime, diffUTCTime, getCurrentTime)
+import Emanote.Prelude (log, logD, logW)
+import Numeric (showGFloat)
+import Relude
+import System.Process.ByteString (readProcessWithExitCode)
+import System.Which (staticWhich)
+import Toml (TomlCodec, encode, list, string, text, (.=))
+
+-- | In-memory Stork index tracked in a @TVar@
+newtype IndexVar = IndexVar (TVar (Maybe LByteString))
+
+newIndex :: MonadIO m => m IndexVar
+newIndex =
+  IndexVar <$> newTVarIO mempty
+
+clearStorkIndex :: (MonadIO m) => IndexVar -> m ()
+clearStorkIndex (IndexVar var) = atomically $ writeTVar var mempty
+
+readOrBuildStorkIndex :: (MonadIO m, MonadLoggerIO m) => IndexVar -> Input -> m LByteString
+readOrBuildStorkIndex (IndexVar indexVar) input = do
+  readTVarIO indexVar >>= \case
+    Just index -> do
+      logD "STORK: Returning cached search index"
+      pure index
+    Nothing -> do
+      -- TODO: What if there are concurrent reads? We probably need a lock.
+      -- And we want to encapsulate this whole thing.
+      logW "STORK: Generating search index (this may be expensive)"
+      (diff, !index) <- timeIt $ runStork input
+      log $ toText $ "STORK: Done generating search index in " <> showGFloat (Just 2) diff "" <> " seconds"
+      atomically $ modifyTVar' indexVar $ \_ -> Just index
+      pure index
+  where
+    timeIt :: MonadIO m => m b -> m (Double, b)
+    timeIt m = do
+      t0 <- liftIO getCurrentTime
+      !x <- m
+      t1 <- liftIO getCurrentTime
+      let diff :: NominalDiffTime = diffUTCTime t1 t0
+      pure (realToFrac diff, x)
+
+storkBin :: FilePath
+storkBin = $(staticWhich "stork")
+
+runStork :: MonadIO m => Input -> m LByteString
+runStork input = do
+  let storkToml = handleTomlandBug $ Toml.encode inputCodec input
+  (_, !index, _) <-
+    liftIO $
+      readProcessWithExitCode
+        storkBin
+        -- NOTE: Cannot use "--output -" due to bug in Rust or Stork:
+        -- https://github.com/jameslittle230/stork/issues/262
+        ["build", "-t", "--input", "-", "--output", "/dev/stdout"]
+        (encodeUtf8 storkToml)
+  pure $ toLazy index
+  where
+    handleTomlandBug =
+      -- HACK: Deal with tomland's bug.
+      -- https://github.com/EmaApps/emanote/issues/336
+      -- https://github.com/kowainik/tomland/issues/408
+      --
+      -- This could be problematic if the user literally uses \\U in their note
+      -- title (but why would they?)
+      T.replace "\\\\U" "\\U"
+
+newtype Input = Input
+  { inputFiles :: [File]
+  }
+  deriving stock (Eq, Show)
+
+data File = File
+  { filePath :: FilePath,
+    fileUrl :: Text,
+    fileTitle :: Text
+  }
+  deriving stock (Eq, Show)
+
+fileCodec :: TomlCodec File
+fileCodec =
+  File
+    <$> Toml.string "path" .= filePath
+    <*> Toml.text "url" .= fileUrl
+    <*> Toml.text "title" .= fileTitle
+
+inputCodec :: TomlCodec Input
+inputCodec =
+  Input
+    <$> Toml.list fileCodec "input.files" .= inputFiles
diff --git a/src/Emanote/Model/Type.hs b/src/Emanote/Model/Type.hs
index 930166c93..262f889ac 100644
--- a/src/Emanote/Model/Type.hs
+++ b/src/Emanote/Model/Type.hs
@@ -27,6 +27,7 @@ import Emanote.Model.StaticFile
   ( IxStaticFile,
     StaticFile (StaticFile),
   )
+import Emanote.Model.Stork.Index qualified as Stork
 import Emanote.Model.Task (IxTask)
 import Emanote.Model.Task qualified as Task
 import Emanote.Model.Title qualified as Tit
@@ -63,7 +64,8 @@ data ModelT encF = Model
     _modelStaticFiles :: IxStaticFile,
     _modelTasks :: IxTask,
     _modelNav :: [Tree Slug],
-    _modelHeistTemplate :: TemplateState
+    _modelHeistTemplate :: TemplateState,
+    _modelStorkIndex :: Stork.IndexVar
   }
   deriving stock (Generic)
 
@@ -90,7 +92,7 @@ withRoutePrism enc Model {..} =
   let _modelRoutePrism = Identity enc
    in Model {..}
 
-emptyModel :: Set Loc -> Some Ema.CLI.Action -> EmanotePandocRenderers Model LMLRoute -> Bool -> UUID -> ModelEma
+emptyModel :: Set Loc -> Some Ema.CLI.Action -> EmanotePandocRenderers Model LMLRoute -> Bool -> UUID -> Stork.IndexVar -> ModelEma
 emptyModel layers act ren ctw instanceId =
   Model Status_Loading layers act (Const ()) ren ctw instanceId Ix.empty Ix.empty Ix.empty Ix.empty mempty mempty def
 
diff --git a/src/Emanote/Route/SiteRoute/Class.hs b/src/Emanote/Route/SiteRoute/Class.hs
index 5907c3b9c..367184274 100644
--- a/src/Emanote/Route/SiteRoute/Class.hs
+++ b/src/Emanote/Route/SiteRoute/Class.hs
@@ -60,6 +60,7 @@ emanoteGeneratableRoutes model =
                       NE.filter (not . null) $ NE.inits tagPath
          in VirtualRoute_Index :
             VirtualRoute_Export :
+            VirtualRoute_StorkIndex :
             VirtualRoute_TaskIndex :
             (VirtualRoute_TagIndex <$> toList tagPaths)
    in htmlRoutes
diff --git a/src/Emanote/Route/SiteRoute/Type.hs b/src/Emanote/Route/SiteRoute/Type.hs
index 0dfe10548..75297bee8 100644
--- a/src/Emanote/Route/SiteRoute/Type.hs
+++ b/src/Emanote/Route/SiteRoute/Type.hs
@@ -24,6 +24,7 @@ data VirtualRoute
   = VirtualRoute_Index
   | VirtualRoute_TagIndex [HT.TagNode]
   | VirtualRoute_Export
+  | VirtualRoute_StorkIndex
   | VirtualRoute_TaskIndex
   deriving stock (Eq, Ord, Show, Generic)
   deriving anyclass (ToJSON)
@@ -65,6 +66,7 @@ decodeVirtualRoute fp =
   (VirtualRoute_Index <$ decodeIndexR fp)
     <|> (VirtualRoute_TagIndex <$> decodeTagIndexR fp)
     <|> (VirtualRoute_Export <$ decodeExportR fp)
+    <|> (VirtualRoute_StorkIndex <$ decodeStorkIndexR fp)
     <|> (VirtualRoute_TaskIndex <$ decodeTaskIndexR fp)
 
 decodeIndexR :: FilePath -> Maybe ()
@@ -77,6 +79,11 @@ decodeExportR fp = do
   "-" :| ["export.json"] <- R.unRoute <$> R.decodeAnyRoute fp
   pass
 
+decodeStorkIndexR :: FilePath -> Maybe ()
+decodeStorkIndexR fp = do
+  "-" :| ["stork.st"] <- R.unRoute <$> R.decodeAnyRoute fp
+  pass
+
 decodeTagIndexR :: FilePath -> Maybe [HT.TagNode]
 decodeTagIndexR fp = do
   "-" :| "tags" : tagPath <- pure $ R.unRoute $ R.decodeHtmlRoute fp
@@ -97,6 +104,8 @@ encodeVirtualRoute = \case
     R.encodeRoute $ R.R @() @'Ext.Html $ "-" :| ["all"]
   VirtualRoute_Export ->
     R.encodeRoute $ R.R @Ext.SourceExt @'Ext.AnyExt $ "-" :| ["export.json"]
+  VirtualRoute_StorkIndex ->
+    R.encodeRoute $ R.R @Ext.SourceExt @'Ext.AnyExt $ "-" :| ["stork.st"]
   VirtualRoute_TaskIndex ->
     R.encodeRoute $ R.R @() @'Ext.Html $ "-" :| ["tasks"]
 
diff --git a/src/Emanote/Source/Dynamic.hs b/src/Emanote/Source/Dynamic.hs
index 8298db068..e578892f7 100644
--- a/src/Emanote/Source/Dynamic.hs
+++ b/src/Emanote/Source/Dynamic.hs
@@ -20,6 +20,7 @@ import Ema (Dynamic (..))
 import Ema.CLI qualified
 import Emanote.CLI qualified as CLI
 import Emanote.Model.Note (Note)
+import Emanote.Model.Stork.Index qualified as Stork
 import Emanote.Model.Type qualified as Model
 import Emanote.Pandoc.Renderer (EmanotePandocRenderers)
 import Emanote.Prelude (chainM)
@@ -53,15 +54,16 @@ emanoteSiteInput :: (MonadUnliftIO m, MonadLoggerIO m) => Some Ema.CLI.Action ->
 emanoteSiteInput cliAct EmanoteConfig {..} = do
   defaultLayer <- Loc.defaultLayer <$> liftIO Paths_emanote.getDataDir
   instanceId <- liftIO UUID.nextRandom
+  storkIndex <- Stork.newIndex
   let layers = Loc.userLayers (CLI.layers _emanoteConfigCli) <> one defaultLayer
-      initialModel = Model.emptyModel layers cliAct _emanoteConfigPandocRenderers _emanoteCompileTailwind instanceId
+      initialModel = Model.emptyModel layers cliAct _emanoteConfigPandocRenderers _emanoteCompileTailwind instanceId storkIndex
   Dynamic
     <$> UM.unionMount
       (layers & Set.map (id &&& Loc.locPath))
       Pattern.filePatterns
       Pattern.ignorePatterns
       initialModel
-      (mapFsChanges $ Patch.patchModel layers _emanoteConfigNoteFn)
+      (mapFsChanges $ Patch.patchModel layers _emanoteConfigNoteFn storkIndex)
 
 type ChangeHandler tag model m =
   tag ->
diff --git a/src/Emanote/Source/Patch.hs b/src/Emanote/Source/Patch.hs
index 96137967a..8a9acfa89 100644
--- a/src/Emanote/Source/Patch.hs
+++ b/src/Emanote/Source/Patch.hs
@@ -14,6 +14,7 @@ import Data.Time (defaultTimeLocale, formatTime, getCurrentTime)
 import Emanote.Model qualified as M
 import Emanote.Model.Note qualified as N
 import Emanote.Model.SData qualified as SD
+import Emanote.Model.Stork.Index qualified as Stork
 import Emanote.Model.Type (ModelEma)
 import Emanote.Prelude
   ( BadInput (BadInput),
@@ -35,6 +36,7 @@ patchModel ::
   (MonadIO m, MonadLogger m, MonadLoggerIO m) =>
   LocLayers ->
   (N.Note -> N.Note) ->
+  Stork.IndexVar ->
   -- | Type of the file being changed
   R.FileType R.SourceExt ->
   -- | Path to the file being changed
@@ -42,19 +44,20 @@ patchModel ::
   -- | Specific change to the file, along with its paths from other "layers"
   UM.FileAction (NonEmpty (Loc, FilePath)) ->
   m (ModelEma -> ModelEma)
-patchModel layers noteF fpType fp action = do
+patchModel layers noteF storkIndexTVar fpType fp action = do
   logger <- askLoggerIO
   now <- liftIO getCurrentTime
   -- Prefix all patch logging with timestamp.
   let newLogger loc src lvl s =
         logger loc src lvl $ fromString (formatTime defaultTimeLocale "[%H:%M:%S] " now) <> s
-  runLoggingT (patchModel' layers noteF fpType fp action) newLogger
+  runLoggingT (patchModel' layers noteF storkIndexTVar fpType fp action) newLogger
 
 -- | Map a filesystem change to the corresponding model change.
 patchModel' ::
   (MonadIO m, MonadLogger m) =>
   LocLayers ->
   (N.Note -> N.Note) ->
+  Stork.IndexVar ->
   -- | Type of the file being changed
   R.FileType R.SourceExt ->
   -- | Path to the file being changed
@@ -62,25 +65,36 @@ patchModel' ::
   -- | Specific change to the file, along with its paths from other "layers"
   UM.FileAction (NonEmpty (Loc, FilePath)) ->
   m (ModelEma -> ModelEma)
-patchModel' layers noteF fpType fp action = do
+patchModel' layers noteF storkIndexTVar fpType fp action = do
   case fpType of
     R.LMLType lmlType -> do
       case R.mkLMLRouteFromKnownFilePath lmlType fp of
         Nothing ->
           pure id -- Impossible
-        Just r -> case action of
-          UM.Refresh refreshAction overlays -> do
-            let fpAbs = locResolve $ head overlays
-                -- TODO: This should automatically be computed, instead of being passed.
-                -- We need access to the model though! With dependency management to boot.
-                -- Until this, `layers` is threaded through as a hack.
-                currentLayerPath = locPath $ primaryLayer layers
-            s <- readRefreshedFile refreshAction fpAbs
-            note <- N.parseNote currentLayerPath r fpAbs (decodeUtf8 s)
-            pure $ M.modelInsertNote $ noteF note
-          UM.Delete -> do
-            log $ "Removing note: " <> toText fp
-            pure $ M.modelDeleteNote r
+        Just r -> do
+          -- Stork doesn't support incremental building of index, so we must
+          -- clear it to pave way for a rebuild later when requested.
+          --
+          -- From https://github.com/jameslittle230/stork/discussions/112#discussioncomment-252861
+          --
+          -- > Stork also doesn't support incremental index updates today --
+          -- you'd have to re-index everything when users added a new document,
+          -- which might be prohibitively long.
+          Stork.clearStorkIndex storkIndexTVar
+
+          case action of
+            UM.Refresh refreshAction overlays -> do
+              let fpAbs = locResolve $ head overlays
+                  -- TODO: This should automatically be computed, instead of being passed.
+                  -- We need access to the model though! With dependency management to boot.
+                  -- Until this, `layers` is threaded through as a hack.
+                  currentLayerPath = locPath $ primaryLayer layers
+              s <- readRefreshedFile refreshAction fpAbs
+              note <- N.parseNote currentLayerPath r fpAbs (decodeUtf8 s)
+              pure $ M.modelInsertNote $ noteF note
+            UM.Delete -> do
+              log $ "Removing note: " <> toText fp
+              pure $ M.modelDeleteNote r
     R.Yaml ->
       case R.mkRouteFromFilePath fp of
         Nothing ->
diff --git a/src/Emanote/View/Template.hs b/src/Emanote/View/Template.hs
index db743d12e..a50d86f34 100644
--- a/src/Emanote/View/Template.hs
+++ b/src/Emanote/View/Template.hs
@@ -1,5 +1,6 @@
 module Emanote.View.Template (emanoteSiteOutput, render) where
 
+import Control.Monad.Logger (MonadLoggerIO)
 import Data.Aeson.Types qualified as Aeson
 import Data.List (partition)
 import Data.List.NonEmpty qualified as NE
@@ -14,6 +15,7 @@ import Emanote.Model.Graph qualified as G
 import Emanote.Model.Meta qualified as Meta
 import Emanote.Model.Note qualified as MN
 import Emanote.Model.SData qualified as SData
+import Emanote.Model.Stork (renderStorkIndex)
 import Emanote.Model.Title qualified as Tit
 import Emanote.Pandoc.BuiltinFilters (prepareNoteDoc)
 import Emanote.Route qualified as R
@@ -37,10 +39,10 @@ import Relude
 import Text.Pandoc.Builder qualified as B
 import Text.Pandoc.Definition (Pandoc (..))
 
-emanoteSiteOutput :: Prism' FilePath SiteRoute -> ModelEma -> SR.SiteRoute -> Ema.Asset LByteString
-emanoteSiteOutput rp model' r =
+emanoteSiteOutput :: (MonadIO m, MonadLoggerIO m) => Prism' FilePath SiteRoute -> ModelEma -> SR.SiteRoute -> m (Ema.Asset LByteString)
+emanoteSiteOutput rp model' r = do
   let model = M.withRoutePrism rp model'
-   in render model r <&> fixStaticUrl
+  render model r <&> fmap fixStaticUrl
   where
     -- See the FIXME in more-head.tpl.
     fixStaticUrl :: LByteString -> LByteString
@@ -62,7 +64,7 @@ emanoteSiteOutput rp model' r =
           guard $ not $ T.null prefix
           pure prefix
 
-render :: Model -> SR.SiteRoute -> Ema.Asset LByteString
+render :: (MonadIO m, MonadLoggerIO m) => Model -> SR.SiteRoute -> m (Ema.Asset LByteString)
 render m sr =
   let setErrorPageMeta =
         MN.noteMeta .~ SData.mergeAesons (withTemplateName "/templates/error" :| [withSiteTitle "Emanote Error"])
@@ -73,14 +75,14 @@ render m sr =
                 MN.missingNote hereRoute (toText urlPath)
                   & setErrorPageMeta
                   & MN.noteTitle .~ "! Missing link"
-          Ema.AssetGenerated Ema.Html $ renderLmlHtml m note404
+          pure $ Ema.AssetGenerated Ema.Html $ renderLmlHtml m note404
         SR.SiteRoute_AmbiguousR urlPath notes -> do
           let noteAmb =
                 MN.ambiguousNoteURL urlPath notes
                   & setErrorPageMeta
                   & MN.noteTitle .~ "! Ambiguous link"
-          Ema.AssetGenerated Ema.Html $ renderLmlHtml m noteAmb
-        SR.SiteRoute_ResourceRoute r -> renderResourceRoute m r
+          pure $ Ema.AssetGenerated Ema.Html $ renderLmlHtml m noteAmb
+        SR.SiteRoute_ResourceRoute r -> pure $ renderResourceRoute m r
         SR.SiteRoute_VirtualRoute r -> renderVirtualRoute m r
 
 renderResourceRoute :: Model -> SR.ResourceRoute -> Ema.Asset LByteString
@@ -95,16 +97,18 @@ renderResourceRoute m = \case
   SR.ResourceRoute_StaticFile _ fpAbs ->
     Ema.AssetStatic fpAbs
 
-renderVirtualRoute :: Model -> SR.VirtualRoute -> Ema.Asset LByteString
+renderVirtualRoute :: (MonadIO m, MonadLoggerIO m) => Model -> SR.VirtualRoute -> m (Ema.Asset LByteString)
 renderVirtualRoute m = \case
   SR.VirtualRoute_TagIndex mtag ->
-    Ema.AssetGenerated Ema.Html $ TagIndex.renderTagIndex m mtag
+    pure $ Ema.AssetGenerated Ema.Html $ TagIndex.renderTagIndex m mtag
   SR.VirtualRoute_Index ->
-    Ema.AssetGenerated Ema.Html $ renderSRIndex m
+    pure $ Ema.AssetGenerated Ema.Html $ renderSRIndex m
   SR.VirtualRoute_Export ->
-    Ema.AssetGenerated Ema.Other $ renderGraphExport m
+    pure $ Ema.AssetGenerated Ema.Other $ renderGraphExport m
+  SR.VirtualRoute_StorkIndex ->
+    Ema.AssetGenerated Ema.Other <$> renderStorkIndex m
   SR.VirtualRoute_TaskIndex ->
-    Ema.AssetGenerated Ema.Html $ TaskIndex.renderTasks m
+    pure $ Ema.AssetGenerated Ema.Html $ TaskIndex.renderTasks m
 
 renderSRIndex :: Model -> LByteString
 renderSRIndex model = do
