diff --git a/docs/docs.json b/docs/docs.json
index b54ff482e..921c9e34e 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -112,7 +112,8 @@
               "/integrations/roo-code",
               "/integrations/n8n",
               "/integrations/xcode",
-              "/integrations/onyx"
+              "/integrations/onyx",
+              "/integrations/marimo"
             ]
           },
           {
diff --git a/docs/images/marimo-add-model.png b/docs/images/marimo-add-model.png
new file mode 100644
index 000000000..bc48a8d9e
Binary files /dev/null and b/docs/images/marimo-add-model.png differ
diff --git a/docs/images/marimo-chat.png b/docs/images/marimo-chat.png
new file mode 100644
index 000000000..661635d6b
Binary files /dev/null and b/docs/images/marimo-chat.png differ
diff --git a/docs/images/marimo-code-completion.png b/docs/images/marimo-code-completion.png
new file mode 100644
index 000000000..0feedf187
Binary files /dev/null and b/docs/images/marimo-code-completion.png differ
diff --git a/docs/images/marimo-models.png b/docs/images/marimo-models.png
new file mode 100644
index 000000000..2ccc616aa
Binary files /dev/null and b/docs/images/marimo-models.png differ
diff --git a/docs/images/marimo-settings.png b/docs/images/marimo-settings.png
new file mode 100644
index 000000000..9857a5982
Binary files /dev/null and b/docs/images/marimo-settings.png differ
diff --git a/docs/integrations/marimo.mdx b/docs/integrations/marimo.mdx
new file mode 100644
index 000000000..33815891b
--- /dev/null
+++ b/docs/integrations/marimo.mdx
@@ -0,0 +1,73 @@
+---
+title: marimo
+---
+
+## Install
+
+Install [marimo](https://marimo.io). You can use `pip` or `uv` for this. You 
+can also use `uv` to create a sandboxed environment for marimo by running:
+
+```
+uvx marimo edit --sandbox notebook.py
+```
+
+## Usage with Ollama
+
+1. In marimo, go to the user settings and go to the AI tab. From here
+you can find and configure Ollama as an AI provider. For local use you
+would typically point the base url to `http://localhost:11434/v1`.
+
+<div style={{ display: 'flex', justifyContent: 'center' }}>
+  <img 
+    src="/images/marimo-settings.png" 
+    alt="Ollama settings in marimo"
+    width="50%"
+  />
+</div>
+
+2. Once the AI provider is set up, you can turn on/off specific AI models you'd like to access. 
+
+<div style={{ display: 'flex', justifyContent: 'center' }}>
+  <img 
+    src="/images/marimo-models.png" 
+    alt="Selecting an Ollama model"
+    width="50%"
+  />
+</div>
+
+3. You can also add a model to the list of available models by scrolling to the bottom and using the UI there. 
+
+<div style={{ display: 'flex', justifyContent: 'center' }}>
+  <img 
+    src="/images/marimo-add-model.png" 
+    alt="Adding a new Ollama model"
+    width="50%"
+  />
+</div>
+
+4. Once configured, you can now use Ollama for AI chats in marimo.
+
+<div style={{ display: 'flex', justifyContent: 'center' }}>
+  <img 
+    src="/images/marimo-chat.png" 
+    alt="Configure code completion"
+    width="50%"
+  />
+</div>
+
+4. Alternatively, you can now use Ollama for **inline code completion** in marimo. This can be configured in the "AI Features" tab. 
+
+<div style={{ display: 'flex', justifyContent: 'center' }}>
+  <img 
+    src="/images/marimo-code-completion.png" 
+    alt="Configure code completion"
+    width="50%"
+  />
+</div>
+
+
+## Connecting to ollama.com
+
+1. Sign in to ollama cloud via `ollama signin` 
+2. In the ollama model settings add a model that ollama hosts, like `gpt-oss:120b`.
+3. You can now refer to this model in marimo!