diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index 4735ccc0..1a83b6a7 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -187,6 +187,14 @@ env.Append(
 if not env.BoardConfig().get("build.ldscript", ""):
     env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.arduino.ldscript", ""))
 
+#
+# Add PSRAM-specific libraries
+#
+
+flatten_cppdefines = env.Flatten(env["CPPDEFINES"])
+if "BOARD_HAS_PSRAM" in flatten_cppdefines:
+    env.Append(LIBS=["c-psram-workaround", "m-psram-workaround"])
+
 #
 # Target: Build Core Library
 #