diff --git a/HISTORY.rst b/HISTORY.rst
index 251c7b80..6a5b2a0b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -17,7 +17,7 @@ Unlock the true potential of embedded software development with
 PlatformIO's collaborative ecosystem, embracing declarative principles,
 test-driven methodologies, and modern toolchains for unrivaled success.
 
-6.1.11 (2023-??-??)
+6.1.11 (2023-08-31)
 ~~~~~~~~~~~~~~~~~~~
 
 * Resolved a possible issue that may cause generated projects for `PlatformIO IDE for VSCode <https://docs.platformio.org/en/latest/integration/ide/vscode.html>`__ to fail to launch a debug session because of a missing "objdump" binary when GDB is not part of the toolchain package
diff --git a/docs b/docs
index fb5dbb92..fb83b09c 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit fb5dbb92e5865de7f96b49704ea8383e877ab99a
+Subproject commit fb83b09c415516ec37018b10d801ddf5c946d794
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 4a563660..c0226cf3 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "11a2")
+VERSION = (6, 1, 11)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/tests/commands/pkg/test_install.py b/tests/commands/pkg/test_install.py
index ea995c68..edcbc241 100644
--- a/tests/commands/pkg/test_install.py
+++ b/tests/commands/pkg/test_install.py
@@ -18,7 +18,7 @@ import os
 
 import pytest
 
-from platformio import fs
+from platformio import __core_packages__, fs
 from platformio.package.commands.install import package_install_cmd
 from platformio.package.manager.library import LibraryPackageManager
 from platformio.package.manager.platform import PlatformPackageManager
@@ -148,7 +148,7 @@ def test_skip_dependencies(
             ),
             PackageSpec("ESPAsyncWebServer-esphome@2.1.0"),
         ]
-        assert len(ToolPackageManager().get_installed()) == 0
+        assert len(ToolPackageManager().get_installed()) == 1  # SCons
 
 
 def test_baremetal_project(
@@ -177,6 +177,7 @@ def test_baremetal_project(
             ),
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("toolchain-atmelavr@1.70300.191015"),
         ]
 
@@ -209,6 +210,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("framework-arduino-avr-attiny@1.5.2"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("toolchain-atmelavr@1.70300.191015"),
         ]
         assert config.get("env:devkit", "lib_deps") == [
diff --git a/tests/commands/pkg/test_uninstall.py b/tests/commands/pkg/test_uninstall.py
index d776b142..73e2179a 100644
--- a/tests/commands/pkg/test_uninstall.py
+++ b/tests/commands/pkg/test_uninstall.py
@@ -198,6 +198,7 @@ def test_project(clirunner, validate_cliresult, isolated_pio_core, tmp_path):
         assert pkgs_to_names(lm.get_installed()) == ["DallasTemperature", "OneWire"]
         assert pkgs_to_names(ToolPackageManager().get_installed()) == [
             "framework-arduino-avr-attiny",
+            "tool-scons",
             "toolchain-atmelavr",
         ]
         assert config.get("env:devkit", "lib_deps") == [
@@ -224,7 +225,7 @@ def test_project(clirunner, validate_cliresult, isolated_pio_core, tmp_path):
             os.path.join(config.get("platformio", "libdeps_dir"), "devkit")
         )
         assert not pkgs_to_names(lm.get_installed())
-        assert not pkgs_to_names(ToolPackageManager().get_installed())
+        assert pkgs_to_names(ToolPackageManager().get_installed()) == ["tool-scons"]
         assert config.get("env:devkit", "lib_deps") == [
             "milesburton/DallasTemperature@^3.9.1"
         ]
diff --git a/tests/commands/pkg/test_update.py b/tests/commands/pkg/test_update.py
index 06ab92a7..5656daac 100644
--- a/tests/commands/pkg/test_update.py
+++ b/tests/commands/pkg/test_update.py
@@ -16,7 +16,7 @@
 
 import os
 
-from platformio import fs
+from platformio import __core_packages__, fs
 from platformio.package.commands.install import package_install_cmd
 from platformio.package.commands.update import package_update_cmd
 from platformio.package.exception import UnknownPackageError
@@ -172,6 +172,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("framework-arduino-avr-attiny@1.3.2"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("toolchain-atmelavr@1.50400.190710"),
         ]
         assert config.get("env:devkit", "lib_deps") == [
@@ -201,6 +202,7 @@ def test_project(
         ]
         assert pkgs_to_specs(ToolPackageManager().get_installed()) == [
             PackageSpec("framework-arduino-avr-attiny@1.3.2"),
+            PackageSpec("tool-scons@%s" % __core_packages__["tool-scons"][1:]),
             PackageSpec("toolchain-atmelavr@1.70300.191015"),
             PackageSpec("toolchain-atmelavr@1.50400.190710"),
         ]