--- agent/Makefile.am
+++ agent/Makefile.am
@@ -46,7 +46,7 @@
 
 gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \
                 $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
-	         -lgpg-error @LIBINTL@
+	         -lgpg-error-nld @LIBINTL@
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
@@ -55,7 +55,7 @@
 
 gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \
 	../jnlib/libjnlib.a  ../common/libcommon.a  \
-	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
+	 $(LIBGCRYPT_LIBS) -lgpg-error-nld @LIBINTL@
 if HAVE_W32_SYSTEM
 gpg_protect_tool_LDADD += -lwsock32
 endif
@@ -65,7 +65,7 @@
 
 gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \
 	../jnlib/libjnlib.a ../common/libcommon.a \
-	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
+	 $(LIBGCRYPT_LIBS) -lgpg-error-nld @LIBINTL@
 if HAVE_W32_SYSTEM
 gpg_preset_passphrase_LDADD += -lwsock32
 endif
--- g10/Makefile.am
+++ g10/Makefile.am
@@ -109,8 +109,8 @@
 #	       $(common_source)
 
 LDADD =  $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@
-gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
-gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error
+gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error-nld
+gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error-nld
 
 $(PROGRAMS): $(needed_libs)
 
--- kbx/Makefile.am
+++ kbx/Makefile.am
@@ -46,5 +46,5 @@
 # Note that libcommon is only required to resolve the LIBOBJS.
 kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_LDADD   = ../jnlib/libjnlib.a  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-                  -lgpg-error $(LIBINTL) ../common/libcommon.a
+                  -lgpg-error-nld $(LIBINTL) ../common/libcommon.a
 
--- scd/Makefile.am
+++ scd/Makefile.am
@@ -54,7 +54,7 @@
 
 scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(pth_libs) $(LIBASSUAN_LIBS) \
-	$(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS)
+	$(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error-nld $(LIBINTL) $(DL_LIBS)
 
 sc_copykeys_SOURCES = \
 	sc-copykeys.c scdaemon.h \
@@ -70,7 +70,7 @@
 	../common/libsimple-pwquery.a \
 	$(LIBGCRYPT_LIBS) $(pth_libs) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
 	 $(LIBUSB_LIBS) $(OPENSC_LIBS) \
-        -lgpg-error @LIBINTL@ @DL_LIBS@
+        -lgpg-error-nld @LIBINTL@ @DL_LIBS@
 
 pcsc_wrapper_SOURCES = pcsc-wrapper.c
 pcsc_wrapper_LDADD = $(DL_LIBS)
--- sm/Makefile.am
+++ sm/Makefile.am
@@ -53,7 +53,7 @@
 
 gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
               ../common/libcommon.a \
-              $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
+              $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error-nld \
 	      $(LIBINTL)