diff --git a/package.json b/package.json
index 25c8a2f6..30079a9e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
     "build:eleventy": "eleventy",
     "postbuild": "del-cli dist/drafts",
     "start": "npm-run-all build:sass-global build:sass-pages --parallel watch:*",
-    "build:dev": "npm-run-all build:sass-global build:sass-pages build:eleventy",
+    "build:pagefind": "npx pagefind@latest --source \"dist\"",
+    "build:dev": "npm-run-all build:sass-global build:sass-pages build:eleventy build:pagefind",
     "build" : "cross-env NODE_ENV=production npm run build:dev",
     "clean": "del-cli dist"
   },
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
index f7f3030b..43ff136c 100644
--- a/src/_includes/layouts/base.njk
+++ b/src/_includes/layouts/base.njk
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' data:;">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval'; img-src 'self' data:;">
     <meta name="generator" content="{{ eleventy.generator }}">
     {%- if description -%}
       <meta name="description" content="{{ description | unmd }}">
@@ -47,6 +47,7 @@
     <meta name="twitter:image:alt" content="{{ titleFull }} - {{ description | unmd }}">
     {#- Tags -#}
     <link rel="manifest" href="/site.webmanifest">
+    <link href="/_pagefind/pagefind-ui.css" rel="stylesheet">
   </head>
   <body>
     {%- include 'partials/site-nav-header.njk' -%}
@@ -55,4 +56,6 @@
     </main>
     {%- include 'partials/site-footer.njk' -%}
   </body>
+  <script src="/_pagefind/pagefind-ui.js" type="text/javascript"></script>
+  <script src="/setup-pf.js" type="text/javascript"></script>
 </html>
diff --git a/src/_includes/partials/site-nav-header.njk b/src/_includes/partials/site-nav-header.njk
index 9b14b126..8ad81e7d 100644
--- a/src/_includes/partials/site-nav-header.njk
+++ b/src/_includes/partials/site-nav-header.njk
@@ -5,6 +5,7 @@
             <a class="logo-link" aria-label="Home" href="{{ "/" | locale_url }}">
                 {% include 'partials/logo.njk' %}
             </a>
+            <div id="search"></div>
             <ul>
                 <li>
                     <a class="nav-link" {% if page.url == '/now/' %} aria-current="page"{% endif %} href="{{ '/now' | locale_url}}">
diff --git a/src/_static/setup-pf.js b/src/_static/setup-pf.js
new file mode 100644
index 00000000..14eb1859
--- /dev/null
+++ b/src/_static/setup-pf.js
@@ -0,0 +1,3 @@
+window.addEventListener('DOMContentLoaded', (event) => {
+    new PagefindUI({ element: "#search" });
+});
\ No newline at end of file
