diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
new file mode 100644
index 000000000000..3803469bf530
--- /dev/null
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "cdrdao-1.2.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/cdrdao/cdrdao-1.2.2.tar.bz2;
+    sha256 = "0f40wm08zm2809xa6kscfk10vgqa3g2vdydnr641r3kzwm0h066y";
+  };
+
+  makeFlags = "RM=rm LN=ln MV=mv";
+
+  #buildInputs = [cmake libcap zlib bzip2];
+
+  meta = {
+    description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode";
+    homepage = http://cdrdao.sourceforge.net/;
+  };
+}
diff --git a/pkgs/applications/misc/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
similarity index 100%
rename from pkgs/applications/misc/cdrkit/default.nix
rename to pkgs/tools/cd-dvd/cdrkit/default.nix
diff --git a/pkgs/os-specific/linux/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
similarity index 100%
rename from pkgs/os-specific/linux/dvd+rw-tools/default.nix
rename to pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 318e9d8ef682..e049a805893a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -477,6 +477,14 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  cdrdao = import ../tools/cd-dvd/cdrdao {
+    inherit fetchurl stdenv;
+  };
+
+  cdrkit = import ../tools/cd-dvd/cdrkit {
+    inherit fetchurl stdenv cmake libcap zlib bzip2;
+  };
+
   cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") {
     inherit makeWrapper;
     python = python25;
@@ -553,6 +561,10 @@ let pkgs = rec {
 
   dosfstools = dosfstoolsFun null;
 
+  dvdplusrwtools = import ../tools/cd-dvd/dvd+rw-tools {
+    inherit fetchurl stdenv cdrkit m4;
+  };
+
   enscript = import ../tools/text/enscript {
     inherit fetchurl stdenv;
   };
@@ -5744,10 +5756,6 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  cdrkit = import ../applications/misc/cdrkit {
-    inherit fetchurl stdenv cmake libcap zlib bzip2;
-  };
-
   chatzilla =
     xulrunnerWrapper {
       launcher = "chatzilla";
@@ -5879,10 +5887,6 @@ let pkgs = rec {
     inherit fetchurl stdenv qt4 djvulibre;
   };
 
-  dvdplusrwtools = import ../os-specific/linux/dvd+rw-tools {
-    inherit fetchurl stdenv cdrkit m4;
-  };
-
   # building eclipise from source
   # experimental tested on x86_64-linux only
   eclipse_classic_src = import ../applications/editors/eclipse/eclipse_classic.nix {