diff --git a/common/shlibs b/common/shlibs
index fbaa363c0c5..53058d21068 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -172,8 +172,8 @@ libnl-idiag-3.so.200 libnl3-3.2.28_1
 libnl-nf-3.so.200 libnl3-3.2.1_1
 libnl-genl-3.so.200 libnl3-3.2.1_1
 libnl-cli-3.so.200 libnl3-3.2.1_1
-libreadline.so.7 readline-7.0_1
-libhistory.so.7 readline-7.0_1
+libreadline.so.8 libreadline8-8.0_1
+libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.2 xfconf-4.9.1_1
 libxfce4util.so.7 libxfce4util-4.12.1_1
 libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1
diff --git a/srcpkgs/libhistory8 b/srcpkgs/libhistory8
new file mode 120000
index 00000000000..1c66ebb0018
--- /dev/null
+++ b/srcpkgs/libhistory8
@@ -0,0 +1 @@
+libreadline8
\ No newline at end of file
diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
new file mode 100644
index 00000000000..f290bc3859a
--- /dev/null
+++ b/srcpkgs/libreadline8/template
@@ -0,0 +1,71 @@
+# Template file for 'libreadline8'
+pkgname=libreadline8
+_dist_ver=8.0
+_patch_ver=000
+version="${_dist_ver}.${_patch_ver}"
+revision=1
+bootstrap=yes
+wrksrc="readline-${_dist_ver}"
+build_style=gnu-configure
+configure_args="--with-curses --enable-multibyte"
+makedepends="ncurses-devel"
+short_desc="GNU Readline Library"
+maintainer="Juan RP <xtraeme@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
+distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
+checksum=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
+
+pre_configure() {
+	local url="${GNU_SITE}/readline/readline-${_dist_ver}-patches"
+
+	cd ${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	if [ "${_patch_ver}" -gt 000 ]; then
+		for p in $(seq -w 001 ${_patch_ver}); do
+			if [ -f readline${version/./}-${p} ]; then
+				continue
+			fi
+			local patch_url="${url}/readline${_dist_ver/./}-${p}"
+			msg_normal " Fetching ${patch_url} ...\n"
+			$XBPS_FETCH_CMD "${patch_url}"
+		done
+	fi
+	cd ${wrksrc}
+	for p in $(seq -w 001 ${_patch_ver}); do
+		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
+		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
+	done
+	vsed -e 's|-Wl,-rpath,$(libdir) ||g' -i support/shobj-conf
+}
+
+do_build() {
+	make ${makejobs} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses"
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses" install
+
+	# Examples and README, COPYING, INSTALL
+	rm -rf ${DESTDIR}/usr/share/{readline,doc}
+}
+
+libhistory8_package() {
+	short_desc+=" - history library"
+	pkg_install() {
+		vmove "usr/lib/libhistory.so.*"
+	}
+}
+
+readline-devel_package() {
+	depends="ncurses-devel ${sourcepkg}-${version}_${revision}
+	 libhistory8-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/man/man3
+		vmove usr/share/info
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libreadline8/update b/srcpkgs/libreadline8/update
new file mode 100644
index 00000000000..034db99ab52
--- /dev/null
+++ b/srcpkgs/libreadline8/update
@@ -0,0 +1,3 @@
+site="https://git.savannah.gnu.org/cgit/readline.git"
+pattern="(readline-\K[\d.]+(?=\.tar.gz))|(Readline-\K[\d.]+ patch \d+)"
+version="${_dist_ver} patch ${_patch_ver}"
diff --git a/srcpkgs/readline-devel b/srcpkgs/readline-devel
index 47f39c3b2ec..1c66ebb0018 120000
--- a/srcpkgs/readline-devel
+++ b/srcpkgs/readline-devel
@@ -1 +1 @@
-readline
\ No newline at end of file
+libreadline8
\ No newline at end of file