diff --git a/agent/ChangeLog b/agent/ChangeLog
index c167c0886..f34849a72 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-18  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am: Use LIBGCRYPT macros
+
 2001-12-14  Werner Koch  <wk@gnupg.org>
 
 	* gpg-agent.c (main): New option --batch.  New option --debug-wait
diff --git a/agent/Makefile.am b/agent/Makefile.am
index a2f8a9a8c..3d9cd2dfe 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS = gpg-agent
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBGCRYPT_CFLAGS)
 LDFLAGS = @LDFLAGS@ 
 
 gpg_agent_SOURCES = \
@@ -33,8 +33,8 @@ gpg_agent_SOURCES = \
 	pkdecrypt.c
 
 gpg_agent_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a  \
-		../common/libcommon.a \
-              ../../libgcrypt/src/.libs/libgcrypt.so.1 
+		../common/libcommon.a $(LIBGCRYPT_LIBS)
+
 
 
 
diff --git a/common/ChangeLog b/common/ChangeLog
index 70bc1cc8a..1d0cec6ea 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-18  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (AM_CPPFLAGS): Include flags for gcrypt and ksba
+
 2001-12-14  Werner Koch  <wk@gnupg.org>
 
 	* util.h (digitp, hexdigitp): New ctype like macros.
diff --git a/common/Makefile.am b/common/Makefile.am
index 3c5e47119..cb266fb5b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -25,6 +25,8 @@ BUILT_SOURCES = errors.c
 
 noinst_LIBRARIES = libcommon.a
 
+AM_CPPFLAGS =  $(LIBGCRYPT_CFLAGS) $(LIBKSBA_CFLAGS)
+
 libcommon_a_SOURCES = \
 	util.h i18n.h \
 	errors.c errors.h \
@@ -33,3 +35,11 @@ libcommon_a_SOURCES = \
 
 errors.c : errors.h mkerrors
 	$(srcdir)/mkerrors < $(srcdir)/errors.h > errors.c
+
+
+
+
+
+
+
+
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index f35742829..3498c9d53 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,5 +1,7 @@
 2001-12-18  Werner Koch  <wk@gnupg.org>
 
+	* Makefile.am (AM_CPPFLAGS): Add flags for libksba
+
 	* keybox-blob.c (_keybox_create_x509_blob): Use
 	gcry_sexp_canon_len to get the length of the serial number.
 	(_keybox_release_blob): Need to use a new serialbuf to free the memory.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 4c783fc1e..5226077bc 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/include
+AM_CPPFLAGS =   $(LIBKSBA_CFLAGS) $(LIBGCRYPT_CLFAGS)
 BUILT_SOURCES = keybox-errors.c
 
 noinst_LIBRARIES = libkeybox.a
@@ -41,9 +41,7 @@ common_sources = \
 libkeybox_a_SOURCES = $(common_sources)
 
 kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD   = ../jnlib/libjnlib.a  \
-		  ../../libksba/src/.libs/libksba.a \
-                  ../../libgcrypt/src/.libs/libgcrypt.so.1 
+kbxutil_LDADD   = ../jnlib/libjnlib.a  $(LIBKSBA_LIBS) $(LIBGCRYPT_LIBS)
 
 keybox-errors.c : keybox.h mkerrors
 	$(srcdir)/mkerrors < $(srcdir)/keybox.h > keybox-errors.c
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 1c21a91dc..50b8bd268 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -20,8 +20,8 @@
 
 bin_PROGRAMS = gpgsm
 
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
-	 $(LIBGCRYPT_CFLAGS) $(LIBKSBA_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
+	       $(LIBGCRYPT_CFLAGS) $(LIBKSBA_CFLAGS)
 LDFLAGS = @LDFLAGS@ 
 
 gpgsm_SOURCES = \