diff --git a/Formula/mariadb.rb b/Formula/mariadb.rb
index 85833c55daf..479025890ee 100644
--- a/Formula/mariadb.rb
+++ b/Formula/mariadb.rb
@@ -3,20 +3,12 @@ require 'formula'
 class Mariadb < Formula
   # You probably don't want to have this and MySQL's formula linked at the same time
   # Just saying.
-  url 'http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.10/kvm-tarbake-jaunty-x86/mariadb-5.2.10.tar.gz'
+  url 'http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.5-ga/kvm-tarbake-jaunty-x86/mariadb-5.3.5-ga.tar.gz'
   homepage 'http://mariadb.org/'
-  md5 'c47fa6448476b06bb15788d3f23e2ae8'
+  md5 '98ce0441b37c8d681855150495fdc03b'
 
   depends_on 'readline'
 
-  def patches
-    # upstream patches to fix compilation failures on OS X
-    # will be present in next release
-    { :p0 => ['http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3085',
-              'http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3075.1.1',
-              'http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3094'] }
-  end
-
   def options
     [
       ['--with-tests', "Keep tests when installing."],
@@ -27,6 +19,12 @@ class Mariadb < Formula
   end
 
   def install
+    # FIXME This should be replaced with fails_with_clang once available
+    if ENV.compiler == :clang
+      opoo "Formula will not build with Clang, using LLVM."
+      ENV.llvm
+    end
+
     ENV.append 'CXXFLAGS', '-fno-omit-frame-pointer -felide-constructors'
 
     # Make universal for bindings to universal applications
@@ -40,7 +38,6 @@ class Mariadb < Formula
       "--localstatedir=#{var}/mysql",
       "--sysconfdir=#{etc}",
       "--with-extra-charsets=complex",
-      "--without-readline",
       "--enable-assembler",
       "--enable-thread-safe-client",
       "--with-big-tables",