diff --git a/ChangeLog b/ChangeLog
index ab4def404804aa411d0218507f65b4512dc75180..b072a5e1fbbdd70514f4628d47b861614c5c2487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Include <cstddef> in python modules to workaround Swig bug.
+
+	* wrap/python/spot.i, wrap/python/buddy.i: Include <cstddef>
+	because Swig 2.0.2 uses ptrdiff_t and does not do the include
+	itself.  In g++ most libstdc++ standard headers have been changed
+	to no longer include <cstddef> as an implementation detail, so
+	the difference shows.
+
 2011-03-20  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* THANKS: Add Michael Weber for his help on the DiVinE interface.
diff --git a/wrap/python/buddy.i b/wrap/python/buddy.i
index f9aee345e101deebb805b248847ecedc40eeca6a..1f44a51972ae3dd785cf9438bb8d6d80a5367ab4 100644
--- a/wrap/python/buddy.i
+++ b/wrap/python/buddy.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2010  Laboratoire de Recherche et Développement de l'EPITA.
+// Copyright (C) 2010, 2011  Laboratoire de Recherche et Développement de l'EPITA.
 // Copyright (C) 2003, 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
 // département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
@@ -52,6 +52,11 @@
     MODIFICATIONS.
 ========================================================================*/
 
+%{
+  // Workaround for SWIG 2.0.2 using ptrdiff_t but not including cstddef.
+  // It matters with g++ 4.6.
+#include <cstddef>
+%}
 
 %module buddy
 
diff --git a/wrap/python/spot.i b/wrap/python/spot.i
index de4866e6240ab07048961982a39057f6c2f4130c..1513176ad4ce3087574878545bfeeb3cbbbb7e50 100644
--- a/wrap/python/spot.i
+++ b/wrap/python/spot.i
@@ -21,6 +21,12 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
+%{
+  // Workaround for SWIG 2.0.2 using ptrdiff_t but not including cstddef.
+  // It matters with g++ 4.6.
+#include <cstddef>
+%}
+
 %module(directors="1") spot
 
 %include "std_string.i"