diff --git a/srcpkgs/libdiscid-devel b/srcpkgs/libdiscid-devel
new file mode 120000
index 00000000000..43414949313
--- /dev/null
+++ b/srcpkgs/libdiscid-devel
@@ -0,0 +1 @@
+libdiscid
\ No newline at end of file
diff --git a/srcpkgs/libdiscid/depends b/srcpkgs/libdiscid/depends
new file mode 100644
index 00000000000..b84ba41c811
--- /dev/null
+++ b/srcpkgs/libdiscid/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.2.2"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libdiscid/libdiscid-devel.template b/srcpkgs/libdiscid/libdiscid-devel.template
new file mode 100644
index 00000000000..2c19dc64737
--- /dev/null
+++ b/srcpkgs/libdiscid/libdiscid-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libasyncns-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run libdiscid
+
+do_install()
+{
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/libdiscid/template b/srcpkgs/libdiscid/template
new file mode 100644
index 00000000000..1e29d163987
--- /dev/null
+++ b/srcpkgs/libdiscid/template
@@ -0,0 +1,19 @@
+# Template file for 'libdiscid'
+pkgname=libdiscid
+version=0.2.2
+homepage="http://musicbrainz.org/doc/libdiscid"
+distfiles="http://users.musicbrainz.org/~matt/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-static"
+short_desc="A Library for creating MusicBrainz DiscIDs"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+checksum=974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402
+long_desc="
+ libdiscid is a C library for creating MusicBrainz DiscIDs from audio CDs.
+ It reads a CD's table of contents (TOC) and generates an identifier which
+ can be used to lookup the CD at MusicBrainz. Additionally, it provides a
+ submission URL for adding the DiscID to the database."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 81ecc73e231..b2aa627fe14 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -883,3 +883,4 @@ libfm.so.1			libfm			libfm-devel
 libfm-gtk.so.1			libfm			libfm-devel
 libunique-1.0.so.0		libunique1		libunique1-devel
 libxnoise.so.0			libxnoise		xnoise-devel
+libdiscid.so.0			libdiscid		libdiscid-devel