diff --git a/ChangeLog b/ChangeLog
index 15c02f963..ed0427aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-07  Paolo Bonzini  <bonzini@gnu.org>
+
+	* opcode/Makefile.am: Fix AM_CPPFLAGS.
+
 2007-08-12  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lightning/i386/core-i386.h: Improve encoding of set* instructions.
diff --git a/opcode/Makefile.am b/opcode/Makefile.am
index ab4e5b028..192390911 100644
--- a/opcode/Makefile.am
+++ b/opcode/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_LIBRARIES = libdisass.a
 noinst_LIBRARIES = @LIBDISASS@
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lightning/$(cpu)
 
 libdisass_a_SOURCES = dis-buf.c i386-dis.c ppc-dis.c ppc-opc.c sparc-dis.c \
 	sparc-opc.c disass.c