diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 9bee5126e0ba..91f009c9f688 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,31 +1,11 @@
-#       $Id: Makefile,v 1.29 1997/06/07 13:18:30 ache Exp $
+#       $Id: Makefile,v 1.30 1998/04/28 07:16:24 ache Exp $
+
+SUBDIR = history readline
 
 SRCDIR= ${.CURDIR}/../../../contrib/libreadline
-.PATH: ${SRCDIR}
 
-SUBDIR= doc
-
-LIB=    readline
-SHLIB_MAJOR= 3
-SHLIB_MINOR= 1
-MAN3=   readline.3
-
-RL_LIBRARY_VERSION = 2.2
-LOCAL_CFLAGS= -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
-CFLAGS+= -I${.CURDIR} -I${SRCDIR} -DHAVE_CONFIG_H ${LOCAL_CFLAGS}
-
-HISTSRC=  history.c histexpand.c histfile.c histsearch.c shell.c
-TILDESRC= tilde.c
-SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
-	  rltty.c complete.c bind.c isearch.c display.c signals.c \
-	  util.c kill.c undo.c macro.c input.c callback.c terminal.c \
-	  nls.c xmalloc.c \
-	  $(HISTSRC) $(TILDESRC)
-
-INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h
-
-DPADD+= $(LIBTERMCAP)
-LDADD+= -ltermcap
+INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
+		   rlstdc.h rlconf.h
 
 beforeinstall:
 .for i in ${INSTALLED_HEADERS}
@@ -33,4 +13,4 @@ beforeinstall:
 		${DESTDIR}/usr/include/readline
 .endfor
 
-.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
new file mode 100644
index 000000000000..7224f8485f56
--- /dev/null
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -0,0 +1,13 @@
+#       $Id: Makefile,v 1.30 1998/04/28 07:16:24 ache Exp $
+
+SHLIB_MAJOR= 4
+SHLIB_MINOR= 0
+RL_LIBRARY_VERSION= 4.0
+
+SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+.PATH: ${SRCDIR} ${.CURDIR}/..
+
+LOCAL_CFLAGS= -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
+CFLAGS+= -I${.CURDIR}/.. -I${SRCDIR} -DHAVE_CONFIG_H ${LOCAL_CFLAGS}
+
+HISTSRC=  history.c histexpand.c histfile.c histsearch.c shell.c
diff --git a/gnu/lib/libreadline/doc/Makefile b/gnu/lib/libreadline/doc/Makefile
deleted file mode 100644
index 3fa54b62ad7c..000000000000
--- a/gnu/lib/libreadline/doc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-SUBDIR = history readline
-
-.include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
new file mode 100644
index 000000000000..d6d3ef91580c
--- /dev/null
+++ b/gnu/lib/libreadline/history/Makefile
@@ -0,0 +1,10 @@
+#       $Id: Makefile,v 1.30 1998/04/28 07:16:24 ache Exp $
+
+SUBDIR= doc
+
+LIB=    history
+
+SRCS= $(HISTSRC) xmalloc.c
+
+.include "../Makefile.inc"
+.include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/doc/history/Makefile b/gnu/lib/libreadline/history/doc/Makefile
similarity index 65%
rename from gnu/lib/libreadline/doc/history/Makefile
rename to gnu/lib/libreadline/history/doc/Makefile
index 4b8112af618d..874822f5517f 100644
--- a/gnu/lib/libreadline/doc/history/Makefile
+++ b/gnu/lib/libreadline/history/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 15:43:06 peter Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
@@ -9,6 +9,6 @@ INFOENTRY_history= "* History: (history).		The GNU History library."
 
 SRCS=	hist.texinfo
 
-history.info: hist.texinfo hstech.texinfo hsuser.texinfo
+history.info: hist.texinfo hstech.texinfo hsuser.texinfo manvers.texinfo
 
 .include <bsd.info.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
new file mode 100644
index 000000000000..4c39be6d7ac0
--- /dev/null
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -0,0 +1,19 @@
+#       $Id: Makefile,v 1.30 1998/04/28 07:16:24 ache Exp $
+
+SUBDIR= doc
+
+LIB=    readline
+MAN3=   readline.3
+
+TILDESRC= tilde.c
+SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
+	  rltty.c complete.c bind.c isearch.c display.c signals.c \
+	  util.c kill.c undo.c macro.c input.c callback.c terminal.c \
+	  nls.c xmalloc.c \
+	  $(HISTSRC) $(TILDESRC)
+
+DPADD+= $(LIBTERMCAP)
+LDADD+= -ltermcap
+
+.include "../Makefile.inc"
+.include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/doc/readline/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
similarity index 65%
rename from gnu/lib/libreadline/doc/readline/Makefile
rename to gnu/lib/libreadline/readline/doc/Makefile
index 8e5104136239..5b8fad288b26 100644
--- a/gnu/lib/libreadline/doc/readline/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 15:43:07 peter Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
@@ -9,6 +9,6 @@ INFOENTRY_readline= "* Readline: (readline).		The GNU Readline library"
 
 SRCS=	rlman.texinfo
 
-readline.info: rlman.texinfo rltech.texinfo rluser.texinfo
+readline.info: rlman.texinfo rltech.texinfo rluser.texinfo manvers.texinfo
 
 .include <bsd.info.mk>