diff --git a/ChangeLog b/ChangeLog
index 75cb84938..ce19f40a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-11-03  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/ltlparse/Makefile.am ($(FROM_LTLPARSE_YY_MAIN)): cd into
+	$(srcdir) before running bison, so that bison does not put
+	absolute filenames in generated files.
+	* src/tgbaparse/Makefile.am ($(FROM_TGBAPARSE_YY_MAIN)): Likewise.
+	Reported by Soheib Baarir.
+
 	* iface/gspn/Makefile.am (gspn_HEADERS): Add eesrg.hh.
 	Reported by Soheib Baarir.
 
diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am
index 9d7eeed5c..f9c5bc9f6 100644
--- a/src/ltlparse/Makefile.am
+++ b/src/ltlparse/Makefile.am
@@ -18,8 +18,12 @@ BUILT_SOURCES = $(FROM_LTLPARSE_YY)
 MAINTAINERCLEANFILES = $(FROM_LTLPARSE_YY)
 
 $(FROM_LTLPARSE_YY_MAIN): $(srcdir)/$(LTLPARSE_YY)
-	bison --defines --locations --skeleton=lalr1.cc --report=all \
-	  $(srcdir)/$(LTLPARSE_YY) -o $@
+## We must cd into $(srcdir) first because if we tell bison to read
+## $(srcdir)/$(LTLPARSE_YY), it will also use the value of $(srcdir)/
+## in the generated include statements.
+	cd $(srcdir) && \
+	  bison --defines --locations --skeleton=lalr1.cc --report=all \
+	  $(LTLPARSE_YY) -o $@
 $(FROM_LTLPARSE_YY_OTHERS): $(LTLPARSE_YY)
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) $(FROM_LTLPARSE_YY_MAIN)
 
diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am
index 107619812..723b1dcba 100644
--- a/src/tgbaparse/Makefile.am
+++ b/src/tgbaparse/Makefile.am
@@ -22,8 +22,12 @@ BUILT_SOURCES = $(FROM_TGBAPARSE_YY)
 MAINTAINERCLEANFILES = $(FROM_TGBAPARSE_YY)
 
 $(FROM_TGBAPARSE_YY_MAIN): $(srcdir)/$(TGBAPARSE_YY)
-	bison --defines --locations --skeleton=lalr1.cc --report=all \
-	  $(srcdir)/$(TGBAPARSE_YY) -o $@
+## We must cd into $(srcdir) first because if we tell bison to read
+## $(srcdir)/$(TGBAPARSE_YY), it will also use the value of $(srcdir)/
+## in the generated include statements.
+	cd $(srcdir) && \
+	  bison --defines --locations --skeleton=lalr1.cc --report=all \
+	  $(TGBAPARSE_YY) -o $@
 $(FROM_TGBAPARSE_YY_OTHERS): $(TGBAPARSE_YY)
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) $(FROM_TGBAPARSE_YY_MAIN)