diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
new file mode 100644
index 000000000000..c5176586aec3
--- /dev/null
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -0,0 +1,16 @@
+{fetchurl, stdenv}:
+
+stdenv.mkDerivation rec {
+  name = "libcddb-1.3.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/libcddb/${name}.tar.bz2";
+    sha256 = "1y8bfy12dwm41m1jahayn3v47dm34fmz7m9cjxyh7xcw6fp3lzaf";
+  };
+
+  meta = {
+    description = ''Libcddb is a C library to access data on a CDDB server
+                    (freedb.org).'';
+    license = "LGPLv2+";
+    homepage = http://libcddb.sourceforge.net/;
+  };
+}
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
new file mode 100644
index 000000000000..b9d815be0836
--- /dev/null
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -0,0 +1,20 @@
+{fetchurl, stdenv, libcddb, pkgconfig, ncurses}:
+
+stdenv.mkDerivation rec {
+  name = "libcdio-0.79";
+  src = fetchurl {
+    url = "mirror://gnu/libcdio/${name}.tar.gz";
+    sha256 = "1xfizvs0yvgs9ddazalsmccd6whqi5fy4dlm3dhcqj72wvpf7w0v";
+  };
+
+  buildInputs = [ libcddb pkgconfig ncurses ];
+
+  meta = {
+    description = ''GNU libcdio is a library for OS-idependent CD-ROM and
+                    CD image access.  It includes a library for working with
+		    ISO-9660 filesystems (libiso9660), as well as utility
+		    programs such as an audio CD player and an extractor.'';
+    license = "GPLv2+";
+    homepage = http://www.gnu.org/software/libcdio/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 120aa461f32b..0b7ca70e89b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2569,6 +2569,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  libcddb = import ../development/libraries/libcddb {
+    inherit fetchurl stdenv;
+  };
+
+  libcdio = import ../development/libraries/libcdio {
+    inherit fetchurl stdenv libcddb pkgconfig ncurses;
+  };
+
   libcm = assert mesaSupported; import ../development/libraries/libcm {
     inherit fetchurl stdenv pkgconfig xlibs mesa;
     inherit (gtkLibs) glib;