diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..8cbc5986ee5
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "githubPullRequests.pullRequestDescription": "commit",
+    "editor.formatOnSave": true
+}
\ No newline at end of file
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 1a2ef3e5e5f..314133e1142 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -28,6 +28,11 @@
 
 # To let us import ./custom_directives.py
 sys.path.insert(0, os.path.abspath("."))
+
+# Add the source tree so we can import executorch without installing it.
+# This helps building the docs in environments where the package isn't installed.
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "src")))
+
 # -- Project information -----------------------------------------------------
 
 project = "ExecuTorch"