diff --git a/CHANGELOG.md b/CHANGELOG.md
index 126eec7b..099e32ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,5 +9,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Let wmi_query and wmi_query_rsop return any error and do not consider it as error when a class is not found.
   [#26](https://github.com/greenbone/openvas-smb/pull/26)
+- Use results of pkgconfig for gnutls.[#30](https://github.com/greenbone/openvas-smb/pull/30)
 
 [20.08.0]: https://github.com/greenbone/openvas-smb/compare/v1.0.5...master
diff --git a/samba/CMakeLists.txt b/samba/CMakeLists.txt
index 82f55e66..e8d0d968 100644
--- a/samba/CMakeLists.txt
+++ b/samba/CMakeLists.txt
@@ -36,6 +36,7 @@ set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> rc <TARGET> <LINK_FLAGS> <OBJECTS>
 
 include_directories(${GSSAPI_INCLUDE_DIRS})
 include_directories(${POPT_INCLUDE_DIRS})
+include_directories(${GNUTLS_INCLUDE_DIRS})
 
 set (SMB_INCLUDES
    ${CMAKE_SOURCE_DIR}/samba
@@ -450,5 +451,5 @@ add_custom_command(
 add_library(samba-static STATIC ${RPC_GEN_SRC} ${SAMBA_SRC} ${RPC_GEN_HEADERS})
 # Link against static heimdal-gssapi ldflags returned by pkg-config
 # Link against libhdb as well since it is missing from the list
-target_link_libraries (samba-static ${GSSAPI_STATIC_LDFLAGS} hdb)
+target_link_libraries (samba-static ${GSSAPI_STATIC_LDFLAGS} ${GNUTLS_STATIC_LDFLAGS} hdb)
 set_target_properties (samba-static PROPERTIES CMAKE_POSITION_INDEPENDENT_CODE TRUE)
diff --git a/wmi/CMakeLists.txt b/wmi/CMakeLists.txt
index 90125c98..cadace68 100644
--- a/wmi/CMakeLists.txt
+++ b/wmi/CMakeLists.txt
@@ -53,7 +53,6 @@ set(WMI_HDR
 )
 
 add_library(openvas_wmiclient SHARED ${WMICLIENT_SRC} ${WMI_SHARED_SRC})
-
 target_link_libraries(openvas_wmiclient samba-static dl ${GNUTLS_LIBRARIES} ${GSSAPI_LIBRARIES} ${POPT_LIBRARIES} ${LINKER_HARDENING_FLAGS})
 
 set_target_properties (openvas_wmiclient PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")