diff -aruN a/doc/examples/Makefile.in b/doc/examples/Makefile.in
--- a/doc/examples/Makefile.in	2010-03-15 03:29:19.000000000 -0700
+++ b/doc/examples/Makefile.in	2010-11-19 11:03:59.000000000 -0800
@@ -827,7 +827,7 @@
 	../../lib/libgnutls.la			\
 	../../libextra/libgnutls-extra.la	\
 	../../gl/libgnu.la			\
-	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LTLIBGCRYPT)
 
 CXX_LDADD = $(LDADD) \
 	../../lib/libgnutlsxx.la
diff -aruN a/doc/Makefile.in b/doc/Makefile.in
--- a/doc/Makefile.in	2010-03-15 03:29:18.000000000 -0700
+++ b/doc/Makefile.in	2010-11-19 11:05:14.000000000 -0800
@@ -806,9 +806,9 @@
 	--no-split --css-include=$(srcdir)/texinfo.css
 
 errcodes_SOURCES = errcodes.c
-errcodes_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
+errcodes_LDADD = ../lib/libgnutls.la ../gl/libgnu.la $(LTLIBGCRYPT)
 printlist_SOURCES = printlist.c
-printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
+printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la $(LTLIBGCRYPT)
 AM_CPPFLAGS = -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes
 guile_texi = core.c.texi extra.c.texi
 BUILT_SOURCES = $(guile_texi)
diff -aruN a/lib/Makefile.in b/lib/Makefile.in
--- a/lib/Makefile.in	2010-03-15 03:28:41.000000000 -0700
+++ b/lib/Makefile.in	2010-11-19 10:22:24.161487057 -0800
@@ -885,7 +885,7 @@
 @HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(DLL_VERSION).def
 
 # C++ library
-@ENABLE_CXX_TRUE@libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I../includes
+@ENABLE_CXX_TRUE@libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I$(builddir)/includes -I../includes
 @ENABLE_CXX_TRUE@AM_CXXFLAGS = -I$(top_srcdir)/includes/
 @ENABLE_CXX_TRUE@libgnutlsxx_la_SOURCES = gnutlsxx.cpp libgnutlsxx.map
 @ENABLE_CXX_TRUE@libgnutlsxx_la_LDFLAGS = -no-undefined -version-info \
diff -aruN a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in	2010-03-15 03:29:21.000000000 -0700
+++ b/src/Makefile.in	2010-11-19 11:02:28.553178489 -0800
@@ -834,26 +834,26 @@
 gnutls_serv_SOURCES = list.h serv.c common.h common.c certtool-common.h
 gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
 	libcmd-serv.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) \
-	$(GETADDRINFO_LIB)
+	$(GETADDRINFO_LIB)
 libcmd_serv_la_CFLAGS = 
 libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c
 @ENABLE_SRP_TRUE@srptool_SOURCES = crypt.c
-@ENABLE_SRP_TRUE@srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la
+@ENABLE_SRP_TRUE@srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la $(LTLIBGCRYPT)
 @ENABLE_SRP_TRUE@libcmd_srp_la_CFLAGS = 
 @ENABLE_SRP_TRUE@libcmd_srp_la_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c
 psktool_SOURCES = psk.c
-psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la
+psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la $(LTLIBGCRYPT)
 libcmd_psk_la_CFLAGS = 
 libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
 gnutls_cli_SOURCES = cli.c common.h common.c
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
 	libcmd-cli.la ../gl/libgnu.la $(LTLIBGCRYPT) $(LIBSOCKET) \
-	$(GETADDRINFO_LIB)
+	$(GETADDRINFO_LIB)
 libcmd_cli_la_CFLAGS = 
 libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c
 gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c common.h common.c
 gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la \
-	../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB)
+	../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) $(LTLIBGCRYPT)
 libcmd_cli_debug_la_CFLAGS = 
 libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c
 certtool_SOURCES = certtool.c prime.c