diff --git a/ChangeLog b/ChangeLog
index aa30a38e5..5bef31844 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-10  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/Makefile.am (nodist_EXTRA_libspot_la_SOURCES): New variable,
+	to force C++ linking.
+
 	* iface/gspn/ltlgspn.cc: Fix a gcc warning in case assert() is
 	disabled.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c76f105e6..22c7488f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,3 +38,5 @@ libspot_la_LIBADD =  \
   tgba/libtgba.la \
   tgbaalgos/libtgbaalgos.la \
   tgbaparse/libtgbaparse.la
+# Dummy C++ source to cause C++ linking.
+nodist_EXTRA_libspot_la_SOURCES = _.cc