diff --git a/cmake/FindGnuTLS.cmake b/cmake/FindGnuTLS.cmake
index bcad27f58..6b16ebcbd 100644
--- a/cmake/FindGnuTLS.cmake
+++ b/cmake/FindGnuTLS.cmake
@@ -30,19 +30,21 @@ IF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
    set(GNUTLS_FIND_QUIETLY TRUE)
 ENDIF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
 
-FIND_PROGRAM(GNUTLS_CONFIG_EXECUTABLE NAMES libgnutls-config)
+FIND_PROGRAM(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --prefix
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
    OUTPUT_VARIABLE GNUTLS_PREFIX
 )
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --cflags
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
    OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --libs
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
    OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
 
 SET(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
 SET(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")
diff --git a/configure.in b/configure.in
index 0124d1bb9..aeb2c13c6 100644
--- a/configure.in
+++ b/configure.in
@@ -600,20 +600,28 @@ fi
 # ------------------------------------------------------------------------------
 
 if test "x$enable_gnutls" = "xyes" ; then
-    found_gnutls="no"
-    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
+   AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
+   AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
+
+   AC_MSG_CHECKING(for gnutls headers and librairies)
+   if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
+      AC_MSG_RESULT(no)
+      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`
+*** WeeChat will be built without GnuTLS support.])
+      enable_gnutls="no"
+      not_found="$not_found gnutls"
+    else
+	AC_MSG_RESULT(yes)
+        GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
+        GNUTLS_LFLAGS=`pkg-config gnutls --libs`
         AC_SUBST(GNUTLS_CFLAGS)
         AC_SUBST(GNUTLS_LFLAGS)
         AC_DEFINE(HAVE_GNUTLS)
-    else
-        enable_gnutls="no"
-        not_found="$not_found gnutls"
+        CFLAGS="$CFLAGS -DHAVE_GNUTLS"
     fi
+else
+    not_asked="$not_asked gnutls"
 fi
 
 # ------------------------------------------------------------------------------