diff --git a/Makefile.in b/Makefile.in
index 688105ea..51707a74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -300,6 +300,7 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 READLINE_CFLAGS = @READLINE_CFLAGS@
+READLINE_LDFLAGS = @READLINE_LDFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/configure b/configure
index 78735830..91572f9f 100755
--- a/configure
+++ b/configure
@@ -633,6 +633,7 @@ STATIC_LDFLAGS
 SQLITE3_LIBS
 SQLITE3_LDFLAGS
 SQLITE3_CFLAGS
+READLINE_LDFLAGS
 READLINE_CFLAGS
 READLINE_LIBS
 PCRE_CFLAGS
@@ -7691,6 +7692,9 @@ else
 
 fi
 
+    saved_CFLAGS=$CFLAGS
+    saved_CPPFLAGS=$CPPFLAGS
+    saved_LDFLAGS=$LDFLAGS
     case "$with_readline" in #(
   no) :
     as_fn_error $? "readline required to build" "$LINENO" 5 ;; #(
@@ -7698,6 +7702,28 @@ fi
      ;; #(
   *) :
             READLINE_CFLAGS="-I$with_readline/include"
+        READLINE_LDFLAGS="-L$with_readline/lib"
+
+  if test "x$CFLAGS" = "x"; then
+    test "x$verbose" = "xyes" && echo "  setting CFLAGS to \"-I$with_readline/include\""
+    CFLAGS="-I$with_readline/include"
+  else
+    ats_addto_bugger="-I$with_readline/include"
+    for i in $ats_addto_bugger; do
+      ats_addto_duplicate="0"
+      for j in $CFLAGS; do
+        if test "x$i" = "x$j"; then
+          ats_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $ats_addto_duplicate = "0"; then
+        test "x$verbose" = "xyes" && echo "  adding \"$i\" to CFLAGS"
+        CFLAGS="$CFLAGS $i"
+      fi
+    done
+  fi
+
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$verbose" = "xyes" && echo "  setting CPPFLAGS to \"-I$with_readline/include\""
@@ -7779,30 +7805,6 @@ if test "$ac_res" != no; then :
   READLINE_LIBS="-lreadline"
 else
   as_fn_error $? "libreadline library not found" "$LINENO" 5
-fi
-
-    for ac_header in readline.h readline/readline.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-         HAVE_READLINE_HEADERS=1
-        break
-
-fi
-
-done
-
-
-
-    if ${HAVE_READLINE_HEADERS+:} false; then :
-
-else
-  as_fn_error $? "readline headers not found" "$LINENO" 5
-
 fi
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing history_set_history_state" >&5
@@ -7864,6 +7866,33 @@ else
 fi
 
 
+    for ac_header in readline.h readline/readline.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+         HAVE_READLINE_HEADERS=1
+        break
+
+fi
+
+done
+
+
+    if ${HAVE_READLINE_HEADERS+:} false; then :
+
+else
+  as_fn_error $? "readline headers not found" "$LINENO" 5
+
+fi
+    CFLAGS=$saved_CFLAGS
+    CPPFLAGS=$saved_CPPFLAGS
+    LDFLAGS=$saved_LDFLAGS
+
+
 
 
 
diff --git a/src/Makefile.in b/src/Makefile.in
index aed29d79..7d4cb7f5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -387,6 +387,7 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 READLINE_CFLAGS = @READLINE_CFLAGS@
+READLINE_LDFLAGS = @READLINE_LDFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -484,6 +485,7 @@ TIME_FORMATS = \
 
 AM_LDFLAGS = \
 	$(STATIC_LDFLAGS) \
+	$(READLINE_LDFLAGS) \
 	$(SQLITE3_LDFLAGS) \
 	$(PCRE_LDFLAGS) \
 	-pthread
@@ -491,6 +493,7 @@ AM_LDFLAGS = \
 AM_CPPFLAGS = \
 	-DSYSCONFDIR='"$(sysconfdir)"' \
 	-Wall \
+	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS)
 
 LDADD = \
diff --git a/test/Makefile.in b/test/Makefile.in
index e29f0f3f..c669f8e4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -596,6 +596,7 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 READLINE_CFLAGS = @READLINE_CFLAGS@
+READLINE_LDFLAGS = @READLINE_LDFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -673,11 +674,13 @@ RM_V_ = $(RM_V_@AM_DEFAULT_V@)
 RM_V_0 = @echo "  RM      " $@;
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
+	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS)
 
 AM_LDFLAGS = \
 	$(STATIC_LDFLAGS) \
 	$(SQLITE3_LDFLAGS) \
+	$(READLINE_LDFLAGS) \
 	-pthread
 
 LDADD = -lz