diff --git a/Formula/libcouchbase.rb b/Formula/libcouchbase.rb
index d9f102da0de..9db80a13ebf 100644
--- a/Formula/libcouchbase.rb
+++ b/Formula/libcouchbase.rb
@@ -5,19 +5,31 @@ class Libcouchbase < Formula
   url 'http://packages.couchbase.com/clients/c/libcouchbase-2.1.3.tar.gz'
   sha1 '460e6b8744b3d5634c5284ff4c690c207c61f9a6'
 
+  option :universal
   option 'with-libev-plugin', 'Build libev IO plugin (will pull libev dependency)'
   option 'without-libevent-plugin', 'Do not build libevent plugin (will remove libevent dependency)'
 
-  depends_on 'libev' if build.include?('with-libev-plugin')
-  depends_on 'libevent' unless build.include?('without-libevent-plugin')
+  depends_on 'libev' if build.with?('libev-plugin')
+  depends_on 'libevent' if build.with?('libevent-plugin')
 
   def install
-    system "./configure", "--disable-debug",
-                          "--disable-dependency-tracking",
-                          "--prefix=#{prefix}",
-                          "--disable-examples",
-                          "--disable-tests", # don't download google-test framework
-                          "--disable-couchbasemock"
+    args = [
+      "--disable-debug",
+      "--disable-dependency-tracking",
+      "--prefix=#{prefix}",
+      "--disable-examples",
+      "--disable-tests", # don't download google-test framework
+      "--disable-couchbasemock"
+    ]
+    if build.universal?
+      args << "--enable-fat-binary"
+      ENV.universal_binary
+    end
+    if build.without?('libev-plugin') && build.without?("libevent-plugin")
+      # do not do plugin autodiscovery
+      args << "--disable-plugins"
+    end
+    system "./configure", *args
     system "make install"
   end