diff --git a/Formula/rancid.rb b/Formula/rancid.rb
index 9ad62dff17..983c66a2d1 100644
--- a/Formula/rancid.rb
+++ b/Formula/rancid.rb
@@ -1,9 +1,8 @@
-require 'formula'
-
 class Rancid < Formula
-  homepage 'http://www.shrubbery.net/rancid/'
-  url 'ftp://ftp.shrubbery.net/pub/rancid/rancid-3.1.tar.gz'
-  sha1 '5e5bdf84634c958ad4cd413c3e31c348340ebd05'
+  homepage "http://www.shrubbery.net/rancid/"
+  url "ftp://ftp.shrubbery.net/pub/rancid/rancid-3.2.tar.gz"
+  mirror "https://mirrors.kernel.org/debian/pool/main/r/rancid/rancid_3.2.orig.tar.gz"
+  sha256 "e7da7242c1f072700b8d6077314be91c1fabe62528de2bdf91349b7094729e75"
 
   bottle do
     sha1 "837224d076cccb23bc1d3891021e3e4fb9dfd791" => :yosemite
@@ -13,11 +12,17 @@ class Rancid < Formula
 
   def install
     system "./configure", "--prefix=#{prefix}", "--exec-prefix=#{prefix}", "--mandir=#{man}"
-    system "make"
-    system "make install"
+    system "make", "install"
   end
 
   test do
-    system "#{bin}/rancid", "-t", "cisco", "localhost"
+    (testpath/"rancid.conf").write <<-EOS.undent
+      BASEDIR=#{testpath}; export BASEDIR
+      CVSROOT=$BASEDIR/CVS; export CVSROOT
+      LOGDIR=$BASEDIR/logs; export LOGDIR
+      RCSSYS=git; export RCSSYS
+      LIST_OF_GROUPS="backbone aggregation switches"
+    EOS
+    system "#{bin}/rancid-cvs", "-f", testpath/"rancid.conf"
   end
 end