diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake
index 04c48d4..c3c3dbc 100644
--- a/cmake/FindPostgreSQL.cmake
+++ b/cmake/FindPostgreSQL.cmake
@@ -205,6 +205,7 @@ find_library(PostgreSQL_LIBRARY
  NAMES ${PostgreSQL_LIBRARY_TO_FIND}
  PATHS
    ${PostgreSQL_ROOT_DIRECTORIES}
+   ${PostgreSQL_LIBRARY_DIR}
  PATH_SUFFIXES
    lib
    ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
diff --git a/configure.plugin b/configure.plugin
index dc7fe2a..2d1d2e7 100644
--- a/configure.plugin
+++ b/configure.plugin
@@ -15,7 +15,6 @@ plugin_option()
     case "$1" in
         --with-postgresql=*)
             append_cache_entry PostgreSQL_ROOT PATH $optarg
-            append_cache_entry PostgreSQL_ROOT PATH $optarg/include
             return 0
             ;;
 
@@ -30,7 +29,6 @@ plugin_option()
 						;;
 
 				--with-postgresql-lib=*)
-						append_cache_entry PostgreSQL_LIBRARY_DIR PATH $optarg
 						append_cache_entry PostgreSQL_LIBRARY_DIR PATH $optarg
 						return 0
 						;;