diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am
index ef911c2..9fdea7e 100644
--- a/common/rdr/Makefile.am
+++ b/common/rdr/Makefile.am
@@ -17,6 +17,10 @@
 if INCLUDED_ZLIB
 librdr_la_CPPFLAGS += -I$(top_srcdir)/common/zlib
 librdr_la_LIBADD += $(top_builddir)/common/zlib/libz.la
+else
+if HAVE_GNUTLS
+librdr_la_LIBADD += -lz
+endif
 endif
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/configure.ac b/configure.ac
index 80d36e3..c1efa8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,11 +90,11 @@
 GNUTLS_LIBS=
 if test "x$enable_gnutls" = xyes; then
 	if test "x$GNUTLS_LDFLAGS" = "x"; then
-		GNUTLS_LDFLAGS='-lgnutls -lgcrypt -lgpg-error -lz'
+		GNUTLS_LDFLAGS='-lgnutls -lgcrypt -lgpg-error'
 		AC_CHECK_LIB([tasn1], [asn1_create_element], [GNUTLS_LDFLAGS="${GNUTLS_LDFLAGS} -ltasn1"])
 	fi
 	SAVE_LIBS=${LIBS}
-	LIBS="${LIBS} ${GNUTLS_LDFLAGS}"
+	LIBS="${LIBS} ${GNUTLS_LDFLAGS} -lz"
 	SAVE_CPPFLAGS=${CPPFLAGS}
 	CPPFLAGS="${CPPFLAGS} ${GNUTLS_CFLAGS}"
 	AC_MSG_CHECKING([for GnuTLS library])