diff --git a/configure.ac b/configure.ac
index 1579bf9..63fc2b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1697,7 +1697,7 @@ if test "$OPENSSL_ENABLED" != "1"; then
       CLEANCPPFLAGS="$CPPFLAGS"
       CLEANLDFLAGS="$LDFLAGS"
 
-      LIBS="$LIBS $addlib -lgcrypt"
+      LIBS="$LIBS $addlib"
       LDFLAGS="$LDFLAGS $addld"
       if test "$addcflags" != "-I/usr/include"; then
          CPPFLAGS="$CPPFLAGS $addcflags"
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index cd67b02..dd26169 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -29,7 +29,7 @@ endif
 CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS)
 
 # Dependencies
-LDADD = $(LIBDIR)/libcurl-gnutls.la
+LDADD = $(LIBDIR)/libcurl-nss.la
 
 # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
 include Makefile.inc
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4a223f8..30118ce 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -42,7 +42,7 @@ EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
 
 CLEANFILES = $(DSP) $(VCPROJ)
 
-lib_LTLIBRARIES = libcurl-gnutls.la
+lib_LTLIBRARIES = libcurl-nss.la
 LIBCURL_LIBS = @LIBCURL_LIBS@
 
 # This might hold -Werror
@@ -120,12 +120,12 @@ if VERSIONED_SYMBOLS
 VERSIONED_SYMBOLS = -Wl,--version-script=libcurl.vers
 endif
 
-libcurl_gnutls_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS) $(VERSIONED_SYMBOLS)
+libcurl_nss_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS) $(VERSIONED_SYMBOLS)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS)
+libcurl_nss_la_SOURCES = $(CSOURCES) $(HHEADERS)
 
 WIN32SOURCES = $(CSOURCES)
 WIN32HEADERS = $(HHEADERS) config-win32.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0eed24c..bb8dec9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,8 +49,8 @@ include Makefile.inc
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@
 
-curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la -lrt @CURL_LIBS@
-curl_DEPENDENCIES = $(top_builddir)/lib/libcurl-gnutls.la
+curl_LDADD = $(top_builddir)/lib/libcurl-nss.la -lrt @CURL_LIBS@
+curl_DEPENDENCIES = $(top_builddir)/lib/libcurl-nss.la
 BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
 # Use the C locale to ensure that only ASCII characters appear in the
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index c4338e4..edf26f8 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -54,8 +54,8 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
 test1022.pl Makefile.inc
 
 # Dependencies (may need to be overriden)
-LDADD = $(top_builddir)/lib/libcurl-gnutls.la @CURL_LIBS@
-DEPENDENCIES = $(top_builddir)/lib/libcurl-gnutls.la
+LDADD = $(top_builddir)/lib/libcurl-nss.la @CURL_LIBS@
+DEPENDENCIES = $(top_builddir)/lib/libcurl-nss.la
 
 # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,
 # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS)
