diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7a34ada8de1..9edc3fe463a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,6 +12,39 @@
       "url": "http://localhost:8000/mkdocs-material/",
       "webRoot": "${workspaceFolder}",
       "smartStep": true
+    },
+    {
+      "name": "MkDocs",
+      "type": "python",
+      "request": "launch",
+      "preLaunchTask": "Start and watch for changes",
+      "program": "venv/bin/mkdocs",
+      "args": ["build"],
+      "env": {
+        "PYTHONPATH": "."
+      }
+    },
+    {
+      "name": "MkDocs server",
+      "type": "python",
+      "request": "launch",
+      "preLaunchTask": "Start and watch for changes",
+      "program": "venv/bin/mkdocs",
+      "args": ["serve", "--watch-theme"],
+      "env": {
+        "PYTHONPATH": "."
+      }
+    },
+    {
+      "name": "MkDocs server (dirty)",
+      "type": "python",
+      "request": "launch",
+      "preLaunchTask": "Start and watch for changes",
+      "program": "venv/bin/mkdocs",
+      "args": ["serve", "--watch-theme", "--dirtyreload"],
+      "env": {
+        "PYTHONPATH": "."
+      }
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 49179e19df8..82c7cdddd35 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -21,6 +21,12 @@
       "group": "build",
       "presentation": {
         "reveal": "silent"
+      },
+      "problemMatcher": {
+        "background": {
+          "beginsPattern": "material\/templates\/redirect",
+          "endsPattern": "."
+        }
       }
     }
   ]