diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 7b377958b..73f3c8b41 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -3,6 +3,9 @@
 	* direntry.c (vfs_s_read): Move MEDATA->linear_start() ...
 	* (vfs_s_open): ... here.
 
+	* samba/include/includes.h: Eliminate all references to
+	HAVE_LIBREADLINE.
+
 2002-05-14  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* Makefile.am (noinst_LIBRARIES): Add samba/libsamba.a
diff --git a/vfs/samba/include/includes.h b/vfs/samba/include/includes.h
index 1314ff7b2..cdd447e42 100644
--- a/vfs/samba/include/includes.h
+++ b/vfs/samba/include/includes.h
@@ -665,24 +665,6 @@ union semun {
 #define ULTRIX_AUTH 1
 #endif
 
-#ifdef HAVE_LIBREADLINE
-#  ifdef HAVE_READLINE_READLINE_H
-#    include <readline/readline.h>
-#    ifdef HAVE_READLINE_HISTORY_H
-#      include <readline/history.h>
-#    endif
-#  else
-#    ifdef HAVE_READLINE_H
-#      include <readline.h>
-#      ifdef HAVE_HISTORY_H
-#        include <history.h>
-#      endif
-#    else
-#      undef HAVE_LIBREADLINE
-#    endif
-#  endif
-#endif
-
 #ifndef HAVE_STRDUP
 char *strdup(const char *s);
 #endif