Index: gnu/lib/libreadline/Makefile
===================================================================
--- gnu/lib/libreadline/Makefile	(revision 268060)
+++ gnu/lib/libreadline/Makefile	(working copy)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR = history readline
+SUBDIR = readline
 
 .include <bsd.subdir.mk>
Index: gnu/lib/libreadline/history/Makefile
===================================================================
--- gnu/lib/libreadline/history/Makefile	(revision 268060)
+++ gnu/lib/libreadline/history/Makefile	(working copy)
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= doc
-
-LIB=    history
-MAN=    rlhistory.3
-
-SRCS= $(HISTSRC) xmalloc.c
-
-rlhistory.3: doc/history.3
-	cp -f ${.ALLSRC} ${.TARGET}
-
-CLEANFILES+= rlhistory.3
-
-.include <bsd.lib.mk>
Index: gnu/lib/libreadline/history/doc/Makefile
===================================================================
--- gnu/lib/libreadline/history/doc/Makefile	(revision 268060)
+++ gnu/lib/libreadline/history/doc/Makefile	(working copy)
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = history
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_history= "* History: (history).		The GNU History library."
-
-history.info: history.texi hstech.texi hsuser.texi version.texi fdl.texi
-
-.include <bsd.info.mk>
Index: gnu/lib/libreadline/readline/Makefile
===================================================================
--- gnu/lib/libreadline/readline/Makefile	(revision 268060)
+++ gnu/lib/libreadline/readline/Makefile	(working copy)
@@ -1,10 +1,7 @@
 # $FreeBSD$
 
-SUBDIR= doc
-
 LIB=    readline
-MAN=    doc/readline.3
-SHLIBDIR?=	/lib
+PRIVATELIB=	true
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
@@ -14,14 +11,18 @@
 
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
+CFLAGS+=	-I${.OBJDIR}/..
 
+SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+
+.for _h in ${INSTALLED_HEADERS}
+CLEANFILES+=	${_h}
+DPSRCS+=	${.OBJDIR}/${_h}
+${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
+	${INSTALL} ${.ALLSRC} ${.TARGET}
+.endfor
+
 DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
 
-INCSDIR=${INCLUDEDIR}/readline
-
-.for hdr in ${INSTALLED_HEADERS}
-INCS+=	${SRCDIR}/${hdr}
-.endfor
-
 .include <bsd.lib.mk>
Index: gnu/lib/libreadline/readline/doc/Makefile
===================================================================
--- gnu/lib/libreadline/readline/doc/Makefile	(revision 268060)
+++ gnu/lib/libreadline/readline/doc/Makefile	(working copy)
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = readline rluserman
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_readline= "* Readline: (readline).		The GNU Readline library"
-INFOENTRY_rluserman= "* Readline: (readline).       The GNU readline library API"
-
-CLEANFILES += readline.texi
-
-readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
-
-readline.texi: rlman.texi
-	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
-
-rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
-
-.include <bsd.info.mk>
Index: gnu/usr.bin/gdb/Makefile.inc
===================================================================
--- gnu/usr.bin/gdb/Makefile.inc	(revision 268060)
+++ gnu/usr.bin/gdb/Makefile.inc	(working copy)
@@ -15,6 +15,7 @@
 OBJ_ROOT= ${.OBJDIR}/../..
 OBJ_BU= ${OBJ_ROOT}/binutils
 OBJ_GDB= ${OBJ_ROOT}/gdb
+OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
 
 # These assignments duplicate much of the functionality of
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
@@ -46,6 +47,7 @@
 CFLAGS+= -I${CNTRB_BU}/include
 CFLAGS+= -I${CNTRB_GDB}/include
 CFLAGS+= -I${CNTRB_BU}/bfd
+CFLAGS+= -I${OBJ_RL}/..
 
 GENSRCS+= nm.h tm.h
 
Index: gnu/usr.bin/gdb/gdb/Makefile
===================================================================
--- gnu/usr.bin/gdb/gdb/Makefile	(revision 268060)
+++ gnu/usr.bin/gdb/gdb/Makefile	(working copy)
@@ -14,6 +14,8 @@
 DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
 LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
 
+USEPRIVATELIB=	readline
+
 NO_PIE=	yes
 
 .include <bsd.prog.mk>
Index: gnu/usr.bin/gdb/gdbtui/Makefile
===================================================================
--- gnu/usr.bin/gdb/gdbtui/Makefile	(revision 268060)
+++ gnu/usr.bin/gdb/gdbtui/Makefile	(working copy)
@@ -15,6 +15,8 @@
 DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
 LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
 
+USEPRIVATELIB=	readline
+
 NO_PIE=	yes
 
 .include <bsd.prog.mk>
Index: gnu/usr.bin/gdb/kgdb/Makefile
===================================================================
--- gnu/usr.bin/gdb/kgdb/Makefile	(revision 268060)
+++ gnu/usr.bin/gdb/kgdb/Makefile	(working copy)
@@ -13,6 +13,8 @@
 LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \
 	-lgnuregex
 
+USEPRIVATELIB=	readline
+
 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -Wl,-export-dynamic
 .endif