diff --git a/sftp/ChangeLog b/sftp/ChangeLog
index 7e74ce82a92f8b1b11e5e60ade1449b83267b91a..60c9de7643a015e09a00324753ec9ebfdf49a785 100644
--- a/sftp/ChangeLog
+++ b/sftp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-16  Niels Möller  <nisse@lysator.liu.se>
+
+	From lsh-2.0.4 branch:
+	* configure.ac: Recognize --with-include-path.
+
 2011-02-25  Niels Möller  <nisse@lysator.liu.se>
 
 	* rl.c (lsftp_rl_init): Deleted cast.
diff --git a/sftp/configure.ac b/sftp/configure.ac
index 36c958ef7c2a6f4b43c121bf8973e16c96976843..8e6cc553ad20c76d8695ae1a9525f4e5369b9d1c 100644
--- a/sftp/configure.ac
+++ b/sftp/configure.ac
@@ -26,7 +26,14 @@ AC_ARG_ENABLE(after_opts,
   AC_HELP_STRING([--enable-after-opts=OPTS],[set the default options to the SecSH client after the commandline.]),
   [after_opts="$withval"])
 
+# Needed only for the nettle/nettle-types.h header.
+AC_ARG_WITH(include-path,
+  AC_HELP_STRING([--with-include-path], [A colon-separated list of directories to search for include files]),,
+  [with_include_path=''])
 
+if test x$with_include_path != x ; then
+  CPPFLAGS="$CPPFLAGS -I`echo $with_include_path | sed 's/:/ -I/g'`"
+fi
 
 dnl Checks for programs.
 AC_PROG_CC