diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index de0f655886..6bc07808cb 100755
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -394,6 +394,10 @@ def main(scriptName, args):
             flags["wxUSE_AFM_FOR_POSTSCRIPT"] = "0"
             flags["wxUSE_DATEPICKCTRL_GENERIC"] = "1"
 
+            # Remove this when Windows XP finally dies, or when there is a
+            # solution for ticket #13116...
+            flags["wxUSE_COMPILER_TLS"] = "0"
+            
             if VERSION < (2,9):
                 flags["wxUSE_DIB_FOR_BITMAP"] = "1"