diff --git a/Formula/samba.rb b/Formula/samba.rb
index 46ff637d2fa..17c48f75c24 100644
--- a/Formula/samba.rb
+++ b/Formula/samba.rb
@@ -2,13 +2,8 @@ require 'formula'
 
 class Samba < Formula
   homepage 'http://samba.org/'
-  url 'http://www.samba.org/samba/ftp/stable/samba-3.6.8.tar.gz'
-  sha1 'a3cd91fa8835c7c47e4cb3ab419f92b4895052b5'
-
-  # Needed for autogen.sh
-  depends_on :autoconf
-  depends_on :automake
-  depends_on :libtool
+  url 'http://www.samba.org/samba/ftp/stable/samba-3.6.20.tar.gz'
+  sha1 '445f579112bc69027f560be276744facc1196fe1'
 
   # Fixes the Grouplimit of 16 users os OS X.
   # Bug has been raised upstream:
@@ -18,15 +13,12 @@ class Samba < Formula
   end
 
   def install
-    # Enable deprecated CUPS structs on Mountain Lion
-    # https://github.com/mxcl/homebrew/issues/13790
-    ENV['CFLAGS'] += " -D_IPP_PRIVATE_STRUCTURES"
     cd 'source3' do
-      system "./autogen.sh"
       system "./configure", "--disable-debug",
-                            "--disable-dependency-tracking",
                             "--prefix=#{prefix}",
-                            "--with-configdir=#{prefix}/etc"
+                            "--with-configdir=#{prefix}/etc",
+                            "--without-ldap",
+                            "--without-krb5"
       system "make install"
       (prefix/'etc').mkpath
       touch prefix/'etc/smb.conf'