diff --git a/docs/Project.toml b/docs/Project.toml
index cb418284..0d8fbc73 100644
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -2,4 +2,4 @@
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 
 [compat]
-Documenter = "~0.22"
+Documenter = "~0.26"
diff --git a/docs/make.jl b/docs/make.jl
index fe0f67b9..0e44bc78 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -1,15 +1,21 @@
-using Documenter, StaticArrays
+using Documenter
+using StaticArrays
 
-makedocs(
-         modules = [StaticArrays],
-         sitename = "StaticArrays.jl",
-         pages = [
-            "Home" => "index.md",
-            "API" => "pages/api.md",
-            "Quick Start" => "pages/quickstart.md",
-            ],
-        )
+# Setup for doctests in docstrings
+DocMeta.setdocmeta!(StaticArrays, :DocTestSetup, :(using LinearAlgebra, StaticArrays))
 
-deploydocs(
-    repo = "github.com/JuliaArrays/StaticArrays.jl.git",
+makedocs(;
+    modules = [StaticArrays],
+    format = Documenter.HTML(
+        canonical = "https://JuliaArrays.github.io/StaticArrays.jl/stable/",
+        assets = ["assets/favicon.ico"],
+    ),
+    pages = [
+        "Home" => "index.md",
+        "API" => "pages/api.md",
+        "Quick Start" => "pages/quickstart.md",
+        ],
+    sitename = "StaticArrays.jl",
 )
+
+deploydocs(; repo = "github.com/juliaarrays/StaticArrays.jl")