diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 18e5f0f70c9e..7fa7da7436fb 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -76,6 +76,10 @@ rec {
     inherit (xlibs) libX11 libXext;
   };
 
+  jdiskreport = (import ../tools/misc/jdiskreport) {
+    inherit fetchurl stdenv unzip jdk;
+  };
+
   diffutils = (import ../tools/text/diffutils) {
     inherit fetchurl stdenv coreutils;
   };
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh
new file mode 100644
index 000000000000..aa4ba13963cd
--- /dev/null
+++ b/pkgs/tools/misc/jdiskreport/builder.sh
@@ -0,0 +1,14 @@
+source $stdenv/setup
+
+unzip $src
+
+ensureDir $out/jars
+mv */*.jar $out/jars
+jar=$(ls $out/jars/jdiskreport-*.jar)
+
+ensureDir $out/bin
+cat > $out/bin/jdiskreport <<EOF
+#! $SHELL -e
+exec $jdk/bin/java -jar $jar
+EOF
+chmod +x $out/bin/jdiskreport
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
new file mode 100644
index 000000000000..92b99834b0af
--- /dev/null
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, unzip, jdk}:
+
+assert jdk.swingSupport;
+
+stdenv.mkDerivation {
+  name = "jdiskreport-1.2.3";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_3.zip;
+    md5 = "4a33c5c1344ed9e0fa531e2cb1875cb8";
+  };
+  buildInputs = [unzip];
+  inherit jdk;
+}