diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 9dbcfaf7ea..0f350b2889 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -4,8 +4,11 @@
 # in XBPS. Every shared library installed by a package must be
 # listed here and mapped to a binary package.
 #
+# The third field controls the development package associated with
+# the binary package that provides the shared library.
+#
 ##########################################################################
-# SHLIB				BINPKG			BINPKG-DEVEL
+# SONAME			BINPKG			BINPKG-DEVEL
 ##########################################################################
 libc.so				glibc			glibc-devel
 libm.so				glibc			glibc-devel
@@ -242,6 +245,7 @@ libXp.so			libXp			libXp-devel
 libXfontcache.so		libXfontcache		libXfontcache-devel
 libXv.so			libXv			libXv-devel
 libXvMC.so			libXvMC			libXvMC-devel
+libXvMCW.so			libXvMC			libXvMC-devel
 libglitz.so			glitz			glitz-devel
 libglitz-glx.so			glitz			glitz-devel
 libxcb-render-util.so		xcb-util		xcb-util-devel
@@ -286,3 +290,105 @@ libMagickCore.so		ImageMagick
 libMagickWand.so		ImageMagick
 libMagick++.so			ImageMagick
 libltdl.so			libltdl			libltdl-devel
+libpoppler-glib.so		poppler-glib		poppler-glib-devel
+libpoppler.so			poppler			poppler-devel
+libtcl8.5.so			tcl			tcl-devel
+libsqlite3.so			sqlite			sqlite-devel
+libtclsqlite3.so		sqlite-tcl		sqlite-devel
+libIDL-2.so			libIDL			libIDL-devel
+libnspr4.so			nspr			nspr-devel
+libplc4.so			nspr			nspr-devel
+libplds4.so			nspr			nspr-devel
+libsoftokn3.so			nss			nss-devel
+libssl3.so			nss			nss-devel
+libnssutil3.so			nss			nss-devel
+libsmime3.so			nss			nss-devel
+libfreebl3.so			nss			nss-devel
+libnssdbm3.so			nss			nss-devel
+libnssckbi.so			nss			nss-devel
+libnss3.so			nss			nss-devel
+libxul.so			xulrunner		xulrunner-devel
+libmozjs.so			xulrunner		xulrunner-devel
+libdbusservice.so		xulrunner		xulrunner-devel
+libimgicon.so			xulrunner		xulrunner-devel
+libxpcom.so			xulrunner		xulrunner-devel
+libcurl.so			curl-libs		curl-devel
+libcompizconfig.so		libcompizconfig		libcompizconfig-devel
+libpyglib-2.0-python.so		pygobject
+libdaemon.so			libdaemon		libdaemon-devel
+libavahi-common.so		avahi-libs		avahi-libs-devel
+libavahi-core.so		avahi-libs		avahi-libs-devel
+libavahi-client.so		avahi-libs		avahi-libs-devel
+libavahi-gobject.so		avahi-glib-libs		avahi-glib-libs-devel
+libavahi-glib.so		avahi-glib-libs		avahi-glib-libs-devel
+libdns_sd.so			avahi-compat-libs	avahi-compat-libs-devel
+libhowl.so			avahi-compat-libs	avahi-compat-libs-devel
+libavahi-ui.so			avahi-ui-libs		avahi-ui-libs-devel
+libmp4v2.so			libmp4v2		libmp4v2-devel
+libmp4av.so			libmp4v2		libmp4v2-devel
+libmpeg4ip_gnu.so		libmp4v2		libmp4v2-devel
+libfaac.so			faac			faac-devel
+libfaad.so			faad2			faad2-devel
+libid3tag.so			libid3tag		libid3tag-devel
+libgif.so			giflib			giflib-devel
+libungif.so			giflib			giflib-devel
+libImlib2.so			imlib2			imlib2-devel
+libmp3lame.so			lame			lame-devel
+libavdevice.so.52		ffmpeg			ffmpeg-devel
+libavformat.so.52		ffmpeg			ffmpeg-devel
+libswscale.so			ffmpeg			ffmpeg-devel
+libpostproc.so.51		ffmpeg			ffmpeg-devel
+libavcodec.so.52		ffmpeg			ffmpeg-devel
+libavutil.so.50			ffmpeg			ffmpeg-devel
+libSDL-1.2.so			SDL			SDL-devel
+libSDL_image-1.2.so		SDL_image		SDL_image-devel
+libx264.so.80			x264			x264-devel
+libxvidcore.so			xvidcore		xvidcore-devel
+libtag.so			taglib			taglib-devel
+libfribidi.so			fribidi			fribidi-devel
+liba52.so			liba52			liba52-devel
+libcddb.so			libcddb			libcddb-devel
+libcdio_cdda.so			libcdio			libcdio-devel
+libiso9660.so			libcdio			libcdio-devel
+libiso9660++.so			libcdio			libcdio-devel
+libudf.so			libcdio			libcdio-devel
+libcdio_paranoia.so		libcdio			libcdio-devel
+libcdio++.so			libcdio			libcdio-devel
+libcdio.so.12			libcdio			libcdio-devel
+libmpcdec.so			libmpcdec		libmpcdec-devel
+libproxy.so			libproxy		libproxy-devel
+libFLAC.so			libflac			libflac-devel
+libFLAC++.so			libflac			libflac-devel
+libmad.so			libmad			libmad-devel
+libmatroska.so			libmatroska		libmatroska-devel
+libebml.so			libebml			libebml-devel
+libdvdread.so			libdvdread		libdvdread-devel
+libdvdnav.so			libdvdnav		libdvdnav-devel
+libdvbpsi.so			libdvbpsi		libdvbpsi-devel
+libdca.so			libdca			libdca-devel
+libmpeg2.so			libmpeg2		libmpeg2-devel
+libmpeg2convert.so		libmpeg2		libmpeg2-devel
+libmng.so			libmng			libmng-devel
+libQtAssistantClient.so		qt			qt-devel
+libQtXmlPatterns.so		qt			qt-devel
+libQtScriptTools.so		qt			qt-devel
+libQtCLucene.so			qt			qt-devel
+libQtMultimedia.so		qt			qt-devel
+libQtGui.so			qt			qt-devel
+libQtDBus.so			qt			qt-devel
+libQtNetwork.so			qt			qt-devel
+libQtOpenGL.so			qt			qt-devel
+libQtXml.so			qt			qt-devel
+libQtTest.so			qt			qt-devel
+libQt3Support.so		qt			qt-devel
+libQtSvg.so			qt			qt-devel
+libQtScript.so			qt			qt-devel
+libQtHelp.so			qt			qt-devel
+libphonon.so			qt			qt-devel
+libQtCore.so			qt			qt-devel
+libQtSql.so			qt			qt-devel
+libQtWebKit.so			qt			qt-devel
+libQtDesignerComponents.so	qt-designer		qt-devel
+libQtDesigner.so		qt-designer		qt-devel
+libvlc.so			vlc
+libvlccore.so			vlc