diff --git a/docs/lsp-clients.json b/docs/lsp-clients.json
index 1581095c2e..da9edb1866 100644
--- a/docs/lsp-clients.json
+++ b/docs/lsp-clients.json
@@ -89,6 +89,15 @@
     "lsp-install-server": "beancount-ls",
     "debugger": "Not available"
   },
+  {
+    "name": "buf",
+    "full-name": "buf CLI (Beta)",
+    "server-name": "buf",
+    "server-url": "https://github.com/bufbuild/buf",
+    "installation": "npm install -g @bufbuild/buf",
+    "installation-url": "https://buf.build/docs/installation",
+    "debugger": "Not available"
+  },
   {
     "name": "bufls",
     "full-name": "buf-language-server",
diff --git a/mkdocs.yml b/mkdocs.yml
index 29aef85c59..035f1c3993 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -55,7 +55,8 @@ nav:
     - AWK: page/lsp-awk.md
     - Bash: page/lsp-bash.md
     - Beancount: page/lsp-beancount.md
-    - Buf/Protocol Buffers: page/lsp-bufls.md
+    - Buf/Protocol Buffers (Buf CLI): page/lsp-buf.md
+    - Buf/Protocol Buffers (Buf Language Server): page/lsp-bufls.md
     - Camel: page/lsp-camel.md
     - C++ (ccls): page/lsp-ccls.md
     - C++ (clangd): page/lsp-clangd.md