Index: gnupg-2.0.10/keyserver/Makefile.in
===================================================================
--- gnupg-2.0.10/keyserver/Makefile.in
+++ gnupg-2.0.10/keyserver/Makefile.in
@@ -395,7 +395,7 @@
 libexec_SCRIPTS = $(GPGKEYS_MAILTO)
 noinst_SCRIPTS = gpg2keys_test
 common_libs = ../gl/libgnu.a  ../common/libcommon.a ../jnlib/libjnlib.a
-other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ../jnlib/libjnlib.a
 gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
 gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
 gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \
@@ -417,13 +417,13 @@
 	$(am__append_8)
 @FAKE_CURL_FALSE@gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
 @FAKE_CURL_TRUE@gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
-@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
+@FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
 @FAKE_CURL_TRUE@gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
 @FAKE_CURL_TRUE@	              $(other_libs) 
 
 @FAKE_CURL_FALSE@gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
 @FAKE_CURL_TRUE@gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
-@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
+@FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
 @FAKE_CURL_TRUE@gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
 @FAKE_CURL_TRUE@	             $(other_libs) 
 
Index: gnupg-2.0.10/sm/Makefile.in
===================================================================
--- gnupg-2.0.10/sm/Makefile.in
+++ gnupg-2.0.10/sm/Makefile.in
@@ -375,7 +375,7 @@
 common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
               ../gl/libgnu.a
 
-gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
               $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV)