diff --git a/ChangeLog b/ChangeLog
index 173d2e18..b69409c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-03  Akim Demaille  <demaille@gostai.com>
+
+	Define yy::variant only when needed.
+	* data/lalr1-fusion.cc (yy::variant): Define only if variants are
+	used.
+
 2008-11-03  Akim Demaille  <demaille@gostai.com>
 
 	Bench the three-stack lalr1.cc.
diff --git a/data/lalr1-fusion.cc b/data/lalr1-fusion.cc
index 73e4e3fc..ca5da6a5 100644
--- a/data/lalr1-fusion.cc
+++ b/data/lalr1-fusion.cc
@@ -155,7 +155,8 @@ dnl FIXME: This is wrong, we want computed header guards.
 ]b4_namespace_open[
   class position;
   class location;
-
+]b4_variant_if(
+[[
   /// A char[S] buffer to store and retrieve objects.
   ///
   /// Sort of a variant, but does not keep track of the nature
@@ -199,7 +200,7 @@ dnl FIXME: This is wrong, we want computed header guards.
     /// A buffer large enough to store any of the semantic values.
     char buffer[S];
   };
-
+]])[
 ]b4_namespace_close[
 
 #include "location.hh"