diff --git a/pkgs/tools/package-management/disnix/DisnixService/default.nix b/pkgs/tools/package-management/disnix/DisnixService/default.nix
index e1c7cb2c8457..1aece5650999 100644
--- a/pkgs/tools/package-management/disnix/DisnixService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixService/default.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchsvn, jdk, apacheAnt, axis2, shebangfix}:
+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-    name = "DisnixService-0.1";
-    src = fetchsvn {
-	url = https://svn.nixos.org/repos/nix/disnix/DisnixService/trunk;
-	md5 = "019e4485e02b65a3402e885592cdd7f5";
-	rev = 12653;
-    };
-    
-    buildInputs = [ jdk apacheAnt axis2 shebangfix ];
-    builder = ./builder.sh;
-    inherit axis2;
-    
-    meta = {
-	license = "LGPL";
-    };
+  name = "DisnixService-0.1";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/337920/download/1/DisnixService-0.1.tar.bz2;
+    sha256 = "18526dh5axmicbahwma2m71hw7j0nkxmmhgl4kd76r61wdiiblx7";
+  };
+  buildInputs = [ apacheAnt ];
+  PREFIX = ''''${env.out}'';
+  AXIS2_LIB = "${axis2}/lib";
+  AXIS2_WEBAPP = "${axis2}/webapps/axis2";
+  DBUS_JAVA_LIB = "${dbus_java}/share/java";
+  patchPhase = ''
+    sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
+           -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
+	   scripts/disnix-soap-client
+  '';
+  buildPhase = "ant";
+  installPhase = "ant install";
 }
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index 0ec33d1a7594..2719e611b1a7 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -1,11 +1,9 @@
-{stdenv, fetchsvn, autoconf, automake}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-nixos";
-  src = fetchsvn {
-    url = https://svn.nixos.org/repos/nix/disnix/disnix-activation-scripts-nixos/trunk;
-    sha256 = "3ba44fbd2c00da6dd1926513184db89c1f3557c55af5c3a4041e85fb6d1a5758";
+  name = "disnix-activation-scripts-test";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/333630/download/1/disnix-activation-scripts-nixos-0.1.tar.gz;
+    sha256 = "0izkkdw9r2gff03mq973ah5b9b0a4b07l8ac0406yv8ss9vaaclm";
   };
-  buildInputs = [ autoconf automake ];
-  preConfigure = "./bootstrap";
 }
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 10113d04a78f..e9b9e722c87b 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,12 +1,10 @@
-{stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, dbus_glib, openssl, libxml2}:
+{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable}:
 
 stdenv.mkDerivation {
-  name = "disnix";
-  src = fetchsvn {
-    url = https://svn.nixos.org/repos/nix/disnix/disnix/trunk;
-    sha256 = "4397dc0bf4b4ecca795784d0011eb631538b17bd81e77b84bf15d89bf85e94bb";
-    rev = 16924;
+  name = "disnix-0.1";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/334661/download/1/disnix-0.1.tar.gz;
+    sha256 = "0qiskbgn49dihhicczsbjandwjnz04yhnlxgwjinkcyfzsh4yqdp";
   };
-  buildInputs = [ autoconf automake libtool pkgconfig dbus_glib openssl libxml2 ];
-  preConfigure = "./bootstrap";
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 900f191146f5..993fba544315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9159,15 +9159,15 @@ let
     };
 
   disnix = import ../tools/package-management/disnix {
-    inherit stdenv fetchsvn openssl autoconf automake libtool pkgconfig dbus_glib libxml2;
+    inherit stdenv fetchurl pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable;
   };
 
   disnix_activation_scripts = import ../tools/package-management/disnix/activation-scripts {
-    inherit stdenv fetchsvn autoconf automake;
+    inherit stdenv fetchurl;
   };
 
   DisnixService = import ../tools/package-management/disnix/DisnixService {
-    inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix;
+    inherit stdenv fetchurl apacheAnt jdk axis2 dbus_java;
   };
 
   latex2html = import ../misc/tex/latex2html/default.nix {