diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 5d25c778a1..8f602d416d 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,14 +1,15 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.5.7
+version=2.5.8
 distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
- --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
- --with-lzma=/usr/bin/lzma --disable-setuid"
+--with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
+--with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
+--enable-socketpair-pipe --without-included-regex --enable-automatic-create" 
 short_desc="The on-line manual database"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e41d4831860c9de85ad21928a542e8f8f1735bcf277f2bc455366397eaa7463e
+checksum=bfdb858810ae5a1a6dad52aa3f15defdfe6f87c84ee62b89b341b42355fdce0d
 long_desc="
  man-db is an implementation of the standard Unix documentation system
  accessed using the man command. It uses a Berkeley DB database in place of
@@ -19,13 +20,12 @@ long_desc="
 conf_files="/etc/man_db.conf"
 
 Add_dependency run glibc
-Add_dependency run bzip2
 Add_dependency run gdbm
 Add_dependency run zlib
 Add_dependency build gettext
-Add_dependency build bzip2-devel
 Add_dependency build gdbm-devel
 Add_dependency build zlib-devel
+Add_dependency full bzip2
 Add_dependency full gzip
 Add_dependency full less
 Add_dependency full groff
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index b2c589032f..743c72dd60 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -163,7 +163,7 @@ libgettextlib-0.18.so		gettext-libs		gettext-devel
 libgettextpo.so			gettext-libs		gettext-devel
 libattr.so			attr			attr-devel
 libacl.so			acl			acl-devel
-libpython2.6.so.1		python			python-devel
+libpython2.7.so.1		python			python-devel
 libffi.so			libffi			libffi-devel
 libcrack.so			cracklib		cracklib-devel
 libpam.so			pam			pam-devel
@@ -672,3 +672,7 @@ libxfce4kbd-private-2.so	libxfce4ui		libxfce4ui-devel
 libntfs.so.10			ntfsprogs		ntfsprogs-devel
 libxml++-2.6.so			libxml++		libxml++-devel
 libftgl.so			ftgl			ftgl-devel
+libGLEW.so.1			glew			glew-devel
+liblightspark.so.0		lightspark
+libman-2.5.8.so			man-db
+libmandb-2.5.8.so		man-db