diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 586e9d5cd5d3..bf1d1357f5e7 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,24 +1,34 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchFromGitHub, ant, jdk }:
 
-stdenv.mkDerivation {
-  name = "jdepend-2.9";
-  buildInputs = [unzip] ;
+stdenv.mkDerivation rec {
+  name = "jdepend-${version}";
+  version = "2.9.1";
 
-  src = fetchurl {
-    url = http://www.clarkware.com/software/jdepend-2.9.zip ;
-    sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90";
+  src = fetchFromGitHub {
+    owner = "clarkware";
+    repo = "jdepend";
+    rev = version;
+    sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p";
   };
 
+  nativeBuildInputs = [ ant jdk ];
+  buildPhase = "ant jar";
+
   installPhase = ''
-    mkdir -p $out
-    cp -R * $out
+    mkdir -p $out/bin $out/share
+    install dist/${name}.jar $out/share
+
+    cat > "$out/bin/jdepend" <<EOF
+    #!${stdenv.shell}
+    exec ${jdk.jre}/bin/java -classpath "$out/share/*" "\$@"
+    EOF
+    chmod a+x $out/bin/jdepend
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Traverses Java class file directories and generates design quality metrics for each Java package";
-    homepage = http://www.clarkware.com/software/JDepend.html ;
+    homepage = http://www.clarkware.com/software/JDepend.html;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }
-
-
-