diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am
index 593b619..ff741c8 100644
--- a/common/rdr/Makefile.am
+++ b/common/rdr/Makefile.am
@@ -11,7 +11,7 @@
 	TLSException.cxx TLSInStream.cxx TLSOutStream.cxx ZlibInStream.cxx \
 	ZlibOutStream.cxx
 
-librdr_la_CPPFLAGS = -I$(top_srcdir)/common @GNUTLS_CFLAGS@
+librdr_la_CPPFLAGS = -I$(top_srcdir)/common
 librdr_la_LIBADD = @GNUTLS_LIBS@
 
 if INCLUDED_ZLIB
diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 401b431..c683fe0 100644
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -52,7 +52,7 @@
 librfb_la_SOURCES += $(VENCRYPT_HDRS) $(VENCRYPT_SRCS)
 endif
 
-librfb_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win @GNUTLS_CFLAGS@
+librfb_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
 librfb_la_LIBADD = @GNUTLS_LIBS@
 
 if INCLUDED_JPEG
diff --git a/configure.ac b/configure.ac
index 3a9ad92..5acd762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,18 +72,15 @@
 AC_ARG_ENABLE([gnutls],
 	AS_HELP_STRING([--enable-gnutls],
 		       [build in GNUTLS based encryption support (default yes)]),
-	[enable_gnutls="$enableval"], [enable_gnutls=no])
-GNUTLS_CFLAGS=
+	[enable_gnutls="$enableval"], [enable_gnutls=yes])
 GNUTLS_LIBS=
 if test "x$enable_gnutls" = xyes; then
-	PKG_CHECK_MODULES([gnutls], [gnutls >= 1.0.0],
-		[AC_DEFINE(HAVE_GNUTLS, 1, [GNUTLS available])], [])
+	AC_CHECK_LIB([gnutls], [gnutls_global_init],
+		     [GNUTLS_LIBS='-lgnutls'
+		      AC_DEFINE([HAVE_GNUTLS], 1, [Is gnutls present? ])])
 fi
-AC_SUBST([GNUTLS_CFLAGS], ["$gnutls_CFLAGS"])
-AC_SUBST([GNUTLS_LIBS], ["$gnutls_LIBS"])
-dnl If --enable-gnutls is passed and gnutls is not installed PKG_CHECK_MODULES
-dnl check above fails so it's safe to assume enable_gnutls == HAVE_GNUTLS
-AM_CONDITIONAL([HAVE_GNUTLS], [ test "x$enable_gnutls" = xyes ])
+AC_SUBST([GNUTLS_LIBS])
+AM_CONDITIONAL([HAVE_GNUTLS], [ ! test "x$GNUTLS_LIBS" = x ])
 
 VNCCONFIG_DIR='vncconfig'
 AC_ARG_ENABLE([vncconfig],