diff --git a/lib/licenses.nix b/lib/licenses.nix
index e49528f2a2e6..171f69389371 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -243,6 +243,12 @@
 
   unfreeRedistributableFirmware = "unfree-redistributable-firmware";
 
+  wadalab = {
+    shortName = "wadalab";
+    fullName = "Wadalab Font License";
+    url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab;
+  };
+
   zlib = {
     shortName = "zlib";
     fullName = "zlib license";
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8a98cb146513..a0aae2f3b592 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -17,6 +17,7 @@
   arobyn = "Alexei Robyn <shados@shados.net>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
+  auntie = "Jonathan Glines <auntieNeo@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   berdario = "Dario Bertini <berdario@gmail.com>";
diff --git a/pkgs/data/fonts/kochi-gothic/default.nix b/pkgs/data/fonts/kochi-gothic/default.nix
new file mode 100644
index 000000000000..9c36da36bf6e
--- /dev/null
+++ b/pkgs/data/fonts/kochi-gothic/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, dpkg }:
+
+let version = "20030809";
+in
+stdenv.mkDerivation {
+  name = "kochi-gothic-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
+    sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea";
+  };
+
+  buildInputs = [ dpkg ];
+
+  unpackCmd = ''
+    dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = {
+    description = "Japanese font, a free replacement for MS Gothic.";
+    longDescription = ''
+      Kochi Gothic was developed as a free replacement for the MS Gothic 
+      font from Microsoft. This is the Debian version of Kochi Gothic, which
+      removes some non-free glyphs that were added from the naga10 font.
+    '';
+    homepage = http://sourceforge.jp/projects/efont/;
+    license = stdenv.lib.licenses.wadalab;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}
diff --git a/pkgs/data/fonts/kochi-mincho/default.nix b/pkgs/data/fonts/kochi-mincho/default.nix
new file mode 100644
index 000000000000..2f31b85220b9
--- /dev/null
+++ b/pkgs/data/fonts/kochi-mincho/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, dpkg }:
+
+let version = "20030809";
+in
+stdenv.mkDerivation {
+  name = "kochi-mincho-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb";
+    sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";
+  };
+
+  buildInputs = [ dpkg ];
+
+  unpackCmd = ''
+    dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = {
+    description = "Japanese font, a free replacement for MS Mincho.";
+    longDescription = ''
+      Kochi Mincho was developed as a free replacement for the MS Mincho 
+      font from Microsoft. This is the Debian version of Kochi Mincho, which
+      removes some non-free glyphs that were added from the naga10 font.
+    '';
+    homepage = http://sourceforge.jp/projects/efont/;
+    license = stdenv.lib.licenses.wadalab;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
deleted file mode 100644
index 625955c444db..000000000000
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-let version = "20030809";
-in
-stdenv.mkDerivation {
-  name = "kochi-substitute-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
-    sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c";
-  };
-
-  sourceRoot = "kochi-substitute-${version}";
-
-  installPhase =
-  ''
-    mkdir -p $out/share/fonts/kochi-substitute
-    cp *.ttf $out/share/fonts/kochi-substitute
-  '';
-
-  meta = {
-    description = "Japanese font, a free replacement for MS Gothic and MS Mincho.";
-    homepage = http://sourceforge.jp/projects/efont/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3be9de80fc1a..b6aaa84f6191 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7789,7 +7789,9 @@ let
 
   junicode = callPackage ../data/fonts/junicode { };
 
-  kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
+  kochi-gothic = callPackage ../data/fonts/kochi-gothic {};
+
+  kochi-mincho = callPackage ../data/fonts/kochi-mincho {};
 
   liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };