diff --git a/nselib/configure b/nselib/configure
index 70e6d715d..7a1c804df 100755
--- a/nselib/configure
+++ b/nselib/configure
@@ -18539,19 +18539,21 @@ if test "${with_libpcre+set}" = set; then
   yes)
     ;;
   included)
-	PCREDIR="../libpcre"
+	PCRE_INCLUDE_DIR="../libpcre"
+	PCRE_LD_DIR="../libpcre"
     ;;
   *)
-    PCREDIR="$with_libpcre"
+    PCRE_INCLUDE_DIR="$with_libpcre/include"
+    PCRE_LD_DIR="$with_libpcre/lib"
     ;;
   esac
 else
-  PCREDIR="../libpcre"
+  PCRE_INCLUDE_DIR="../libpcre";PCRE_LD_DIR="../libpcre"
 
 fi
 
-PCRE_INCLUDE="-I$PCREDIR"
-PCRE_LD="-L$PCREDIR"
+PCRE_INCLUDE="-I$PCRE_INCLUDE_DIR"
+PCRE_LD="-L$PCRE_LD_DIR"
 PCRE_LIBS="-lpcre"
 
 # AC_SUBST(PCREDIR)
diff --git a/nselib/configure.ac b/nselib/configure.ac
index f364350b2..691b52d13 100644
--- a/nselib/configure.ac
+++ b/nselib/configure.ac
@@ -29,16 +29,18 @@ AC_HELP_STRING([--with-libpcre=included], [Always use the version included with
   yes)
     ;;
   included)
-	PCREDIR="../libpcre"
+	PCRE_INCLUDE_DIR="../libpcre"
+	PCRE_LD_DIR="../libpcre"
     ;;
   *)
-    PCREDIR="$with_libpcre"
+    PCRE_INCLUDE_DIR="$with_libpcre/include"
+    PCRE_LD_DIR="$with_libpcre/lib"
     ;;
   esac], 
-PCREDIR="../libpcre"
+[PCRE_INCLUDE_DIR="../libpcre";PCRE_LD_DIR="../libpcre"]
 )
-PCRE_INCLUDE="-I$PCREDIR"
-PCRE_LD="-L$PCREDIR"
+PCRE_INCLUDE="-I$PCRE_INCLUDE_DIR"
+PCRE_LD="-L$PCRE_LD_DIR"
 PCRE_LIBS="-lpcre"
 
 # AC_SUBST(PCREDIR)