diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index d52a53d3e..f7681f0e7 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-06  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (AM_CFLAGS): Add $(GPG_ERROR_CFLAGS).
+
 2006-08-16  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am: Renamed all binaries to gpg2keys_*.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index a61fa3032..1bfcd7266 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_SCRIPTS = gpg2keys_mailto
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 include $(top_srcdir)/am/cmacros.am