diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 045d32c27..db75ed22e 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-26  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Make use of AM_CFLAGS. (From wk on stable branch)
+
 2003-05-24  David Shaw  <dshaw@jabberwocky.com>
 
 	* mpicoder.c, mpi-inline.h, mpi-inv.c, mpiutil.c, mpih-div.c,
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 56cf47a52..7551a8b5c 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -20,7 +20,7 @@
 
 
 INCLUDES = -I.. -I$(top_srcdir)/include
-CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
+AM_CFLAGS = @MPI_OPT_FLAGS@
 ASFLAGS = @MPI_SFLAGS@
 
 EXTRA_DIST = config.links