diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/builder.sh b/pkgs/tools/virtualization/amazon-ec2-api-tools/builder.sh
deleted file mode 100644
index 1bea40a0456..00000000000
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-ensureDir $out
-
-unzip $src
-mv ec2-api-tools-*/* $out
-
-fixupPhase
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
index 29a693a116a..6c568a95c2f 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
@@ -1,12 +1,31 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "ec2-api-tools";
-  buildInputs = [unzip];
+  name = "ec2-api-tools-1.3-46266";
+  
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "1d5j3hsa9vswrhan5yf2v6sq3plpfl4lgdvk3wlaw14rdv50cdiv";
+    sha256 = "06d5hpzc18bj30hjc477xx62hsspgfkn3fdccrg1avadgwsykgq6";
   };
 
-  builder = ./builder.sh ;
+  buildInputs = [ unzip makeWrapper ];
+
+  installPhase =
+    ''
+      ensureDir $out
+      mv * $out
+      rm $out/bin/*.cmd # Windows stuff
+
+      for i in $out/bin/*; do
+          wrapProgram $i \
+            --set EC2_HOME $out \
+            --set JAVA_HOME ${jre}
+      done
+    ''; # */
+  
+  meta = {
+    homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351;
+    description = "Command-line tools to create and manage Amazon EC2 virtual machines";
+    license = "unfree-redistributable";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3744426741..927cacd6609 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -330,7 +330,7 @@ let
   };
 
   ec2apitools = import ../tools/virtualization/amazon-ec2-api-tools {
-    inherit stdenv fetchurl unzip ;
+    inherit stdenv fetchurl unzip makeWrapper jre;
   };
 
   amule = import ../tools/networking/p2p/amule {