diff --git a/ChangeLog b/ChangeLog
index 6a27ad629..37539b728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050810
+ - (dtucker) [configure.ac] Test libedit library and headers for compatibility.
+   Report from skeleten AT shillest.net, ok djm@
+
 20050809
  - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@
    Report by skeleten AT shillest.net
@@ -2900,4 +2904,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3863 2005/08/09 17:09:53 tim Exp $
+$Id: ChangeLog,v 1.3864 2005/08/10 10:34:15 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index a6fae9ff0..60dbd0c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.283 2005/08/09 17:09:54 tim Exp $
+# $Id: configure.ac,v 1.284 2005/08/10 10:34:15 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -1023,6 +1023,20 @@ AC_ARG_WITH(libedit,
 			[ AC_MSG_ERROR(libedit not found) ],
 			[ -lcurses ]
 		)
+		AC_MSG_CHECKING(if libedit version is compatible)
+		AC_TRY_COMPILE([#include <histedit.h>],
+		    [
+int main(void)
+{
+	int i = H_SETSIZE;
+	el_init("", NULL, NULL, NULL);
+	exit(0);
+}
+		    ],
+		    [ AC_MSG_RESULT(yes) ],
+		    [ AC_MSG_RESULT(no)
+		      AC_MSG_ERROR(libedit version is not compatible) ]
+		)
 	fi ]
 )