diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 1dde51e5907..fe8b30936f4 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,7 +1,7 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.0.14
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config"
@@ -9,10 +9,11 @@ makedepends="gmp-devel libltdl-devel libunistring-devel libffi-devel gc-devel
  ncurses-devel readline-devel"
 short_desc="A portable, embeddable Scheme implementation written in C"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-3, LGPL-3"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="http://www.gnu.org/software/${pkgname}"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+subpackages="libguile guile-devel"
 
 if [ "$CROSS_BUILD" ]; then
 	# Need host guile to cross compile
@@ -23,6 +24,7 @@ libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/libguilereadline*.so"
 		vmkdir usr/share/gdb/auto-load/usr/lib
 		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
 	}