3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
index 1fe9e0b1c39a..745964accafc 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, perl, autoconf}:
 
 stdenv.mkDerivation {
-  name = "automake-1.9.4";
+  name = "automake-1.9.6";
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz;
-    md5 = "5b46bde56e321a7bab7832168cf0b9b8";
+    url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz;
+    md5 = "c60f77a42f103606981d456f1615f5b4";
   };
   buildInputs = [perl autoconf];
 }
diff --git a/pkgs/development/tools/misc/automake/default.nix b/pkgs/development/tools/misc/automake/default.nix
index f666f6487e74..a70268ea45c4 100644
--- a/pkgs/development/tools/misc/automake/default.nix
+++ b/pkgs/development/tools/misc/automake/default.nix
@@ -1 +1 @@
-import ./automake-1.7.9.nix
+import ./automake-1.9.x.nix
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index fb5a6498d8c9..b66a3af69040 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -296,7 +296,7 @@ rec {
     m4 = gnum4;
   };
 
-  automake = (import ../development/tools/misc/automake) {
+  automake17x = (import ../development/tools/misc/automake/automake-1.7.x.nix) {
     inherit fetchurl stdenv perl autoconf;
   };
 
@@ -304,6 +304,8 @@ rec {
     inherit fetchurl stdenv perl autoconf;
   };
 
+  automake = automake19x;
+
   libtool = (import ../development/tools/misc/libtool) {
     inherit fetchurl stdenv perl;
     m4 = gnum4;