diff --git a/platformio/__init__.py b/platformio/__init__.py
index cebcd1ed..b3ff0e42 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -50,7 +50,7 @@ __core_packages__ = {
     "contrib-piohome": "~3.3.3",
     "contrib-pysite": "~2.%d%d.0" % (sys.version_info.major, sys.version_info.minor),
     "tool-unity": "~1.20500.0",
-    "tool-scons": "~2.20501.7" if sys.version_info.major == 2 else "~4.40100.0",
+    "tool-scons": "~2.20501.7" if sys.version_info.major == 2 else "~4.40100.1",
     "tool-cppcheck": "~1.230.0",
     "tool-clangtidy": "~1.100000.0",
     "tool-pvs-studio": "~7.11.0",
diff --git a/platformio/builder/tools/piomaxlen.py b/platformio/builder/tools/piomaxlen.py
index 4077273c..c05ae821 100644
--- a/platformio/builder/tools/piomaxlen.py
+++ b/platformio/builder/tools/piomaxlen.py
@@ -67,6 +67,8 @@ def generate(env):
         _long_sources_hook=long_sources_hook,
         TEMPFILE=TempFileMunge,
         MAXLINELENGTH=MAX_LINE_LENGTH,
+        TEMPFILESUFFIX=".tmp",
+        TEMPFILEDIR="$BUILD_DIR",
     )
 
     for name in ("LINKCOM", "ASCOM", "ASPPCOM", "CCCOM", "CXXCOM"):