diff --git a/code.sh b/code.sh
index 3d5e534..d2276d1 100755
--- a/code.sh
+++ b/code.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+shopt -s nullglob
 
 FIRST_RUN="${XDG_CONFIG_HOME}/flatpak-vscode-first-run"
 
@@ -13,6 +14,30 @@ if [ ! -f ${FIRST_RUN} ]; then
   touch ${FIRST_RUN}
 fi
 
+PYTHON_SITEDIR=$(python3 <<EOFPYTHON
+import os
+import site
+print(os.path.relpath(site.getusersitepackages(), site.getuserbase()))
+EOFPYTHON
+)
+
+for tool_dir in /app/tools/*; do
+  tool_bindir=$tool_dir/bin
+  if [ -d "$tool_bindir" ]; then
+    msg "Adding $tool_bindir to PATH"
+    export PATH=$PATH:$tool_bindir
+  fi
+  tool_pythondir=$tool_dir/$PYTHON_SITEDIR
+  if [ -d "$tool_pythondir" ]; then
+    msg "Adding $tool_pythondir to PYTHONPATH"
+    if [ -z "$PYTHONPATH" ]; then
+      export PYTHONPATH=$tool_pythondir
+    else
+      export PYTHONPATH=$PYTHONPATH:$tool_pythondir
+    fi
+  fi
+done
+
 if [ "$FLATPAK_ENABLE_SDK_EXT" = "*" ]; then
   SDK=()
   for d in /usr/lib/sdk/*; do
diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml
index d5d52a8..ce32b6d 100644
--- a/com.visualstudio.code.yaml
+++ b/com.visualstudio.code.yaml
@@ -27,6 +27,12 @@ finish-args:
   - --filesystem=xdg-config/kdeglobals:ro
   - --talk-name=com.canonical.AppMenu.Registrar
   - --talk-name=com.canonical.AppMenu.Registrar.*
+add-extensions:
+  com.visualstudio.code.tool:
+    directory: tools
+    subdirectories: true
+    add-ld-path: lib
+    no-autodownload: true
 cleanup:
   - /include
   - /lib/pkgconfig
@@ -53,6 +59,7 @@ modules:
       - ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so
         /app/lib
       - ARCH_TRIPLE=$(gcc --print-multiarch) && ln -s /usr/lib/${ARCH_TRIPLE}/libtinfo.so/app/lib/libtinfo.so.5
+      - mkdir /app/tools
     sources:
       - type: script
         dest-filename: apply_extra