diff --git a/weechat/configure.in b/weechat/configure.in
index 7a6fe93..b9771c3 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -600,20 +600,8 @@ fi
 # ------------------------------------------------------------------------------
 
 if test "x$enable_gnutls" = "xyes" ; then
-    found_gnutls="no"
-    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
-*** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
-*** WeeChat will be built without GnuTLS support.]]))
-    if test "x$found_gnutls" = "xyes" ; then
-        GNUTLS_CFLAGS=`libgnutls-config --cflags`
-        GNUTLS_LFLAGS=`libgnutls-config --libs`
-        AC_SUBST(GNUTLS_CFLAGS)
-        AC_SUBST(GNUTLS_LFLAGS)
-        AC_DEFINE(HAVE_GNUTLS)
-    else
-        enable_gnutls="no"
-        not_found="$not_found gnutls"
-    fi
+   PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.0.0])
+   AC_DEFINE(HAVE_GNUTLS)
 fi
 
 # ------------------------------------------------------------------------------
diff --git a/weechat/src/gui/curses/Makefile.am b/weechat/src/gui/curses/Makefile.am
index 5d2ce77..583835a 100644
--- a/weechat/src/gui/curses/Makefile.am
+++ b/weechat/src/gui/curses/Makefile.am
@@ -25,14 +25,14 @@ weechat_curses_LDADD = ../lib_weechat_gui_common.a \
                        ../../plugins/lib_weechat_plugins.a \
                        $(PLUGINS_LIBS) \
                        $(NCURSES_LIBS) \
-                       $(GNUTLS_LFLAGS)
+                       $(GNUTLS_LIBS)
 else
 weechat_curses_LDADD = ../lib_weechat_gui_common.a \
                        ../../common/lib_weechat_main.a \
                        ../../irc/lib_weechat_irc.a \
                        $(PLUGINS_LIBS) \
                        $(NCURSES_LIBS) \
-                       $(GNUTLS_LFLAGS)
+                       $(GNUTLS_LIBS)
 endif
 
 weechat_curses_SOURCES = gui-curses-chat.c \
diff --git a/weechat/src/gui/gtk/Makefile.am b/weechat/src/gui/gtk/Makefile.am
index 1fc3542..29d00f2 100644
--- a/weechat/src/gui/gtk/Makefile.am
+++ b/weechat/src/gui/gtk/Makefile.am
@@ -25,14 +25,14 @@ weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
                     ../../plugins/lib_weechat_plugins.a \
                     $(PLUGINS_LIBS) \
                     $(GTK_LIBS) \
-                    $(GNUTLS_LFLAGS)
+                    $(GNUTLS_LIBS)
 else
 weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
                     ../../common/lib_weechat_main.a \
                     ../../irc/lib_weechat_irc.a \
                     $(PLUGINS_LIBS) \
                     $(GTK_LIBS) \
-                    $(GNUTLS_LFLAGS)
+                    $(GNUTLS_LIBS)
 endif
 
 weechat_gtk_SOURCES = gui-gtk-chat.c \