diff --git a/README.md b/README.md
index 8eaa18a..0011fbc 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,8 @@ Homebrew tap for HyperDex.
 
 Optional client bindings can be individually selected with
 `brew install --with-java-bindings --with-python-bindings --with-ruby-bindings hyperdex`
+
+
+Enabling bindings for ycsb:
+
+`CLASSPATH=<ycsb folder>/core/lib/core-<ycsb-version>.jar brew install --with-java-bindings --with-enable-ycsb hyperdex`
diff --git a/hyperdex.rb b/hyperdex.rb
index 5ca8686..2915b29 100644
--- a/hyperdex.rb
+++ b/hyperdex.rb
@@ -2,8 +2,8 @@
 
 class Hyperdex < Formula
   homepage 'http://hyperdex.org'
-  url 'http://hyperdex.org/src/hyperdex-1.4.4.tar.gz'
-  sha1 'c5b126fc7862de66eab54fa5ef3c7cbb84b2bc9b'
+  url 'http://hyperdex.org/src/hyperdex-1.6.0.tar.gz'
+  sha1 'b019a2d1fc3e25a140b729d4392f7c07dd0cfcc2'
 
   depends_on 'autoconf'
   depends_on 'automake'
@@ -20,10 +20,13 @@ class Hyperdex < Formula
   depends_on 'busybee'
   depends_on 'hyperleveldb'
   depends_on 'replicant'
+  depends_on 'libmacaroons'
+  depends_on 'libtreadstone'
 
   option 'with-python-bindings', "Builds and installs Python client bindings"
   option 'with-java-bindings', "Builds and installs Java client bindings"
   option 'with-ruby-bindings', "Builds and installs Ruby client bindings"
+  option 'with-enable-ycsb', "Enable the Yahoo Cloud Serving Benchmark"
 
   def patches
     DATA
@@ -35,6 +38,7 @@ def install
     args << "--enable-java-bindings" if build.with? "java-bindings"
     args << "--enable-python-bindings" if build.with? "python-bindings"
     args << "--enable-ruby-bindings" if build.with? "ruby-bindings"
+    args << "--enable-ycsb" if build.with? "enable-ycsb"
     
     system "./configure", "--prefix=#{prefix}", *args
     system "make"
diff --git a/hyperleveldb.rb b/hyperleveldb.rb
index 00e0efc..237286b 100644
--- a/hyperleveldb.rb
+++ b/hyperleveldb.rb
@@ -2,8 +2,8 @@
 
 class Hyperleveldb < Formula
   homepage 'http://hyperdex.org'
-  url 'http://hyperdex.org/src/hyperleveldb-1.2.1.tar.gz'
-  sha1 'fc43412dbc2cafc7cee8fd47b3e12a84c2833ec4'
+  url 'http://hyperdex.org/src/hyperleveldb-1.2.2.tar.gz'
+  sha1 '5cc2694f5f13388a28e17cd65a6b650ebc3d39a4'
 
   def install
     ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig"
diff --git a/libe.rb b/libe.rb
index 9340fb1..c02dd21 100644
--- a/libe.rb
+++ b/libe.rb
@@ -2,8 +2,8 @@
 
 class Libe < Formula
   homepage 'http://hyperdex.org'
-  url 'http://hyperdex.org/src/libe-0.8.1.tar.gz'
-  sha1 '95c42531d4834b5eb801694b6929f831b76a24f0'
+  url 'http://hyperdex.org/src/libe-0.9.0.tar.gz'
+  sha1 '30b6273a1f374035dfbe770bdee36ac0b30a24c4'
 
   depends_on 'autoconf'
   depends_on 'automake'
diff --git a/libmacaroons.rb b/libmacaroons.rb
new file mode 100644
index 0000000..ce8f3b7
--- /dev/null
+++ b/libmacaroons.rb
@@ -0,0 +1,22 @@
+require 'formula'
+
+class Libmacaroons < Formula
+  homepage 'http://hyperdex.org'
+  url 'http://hyperdex.org/src/libmacaroons-0.2.0.tar.gz'
+  sha1 'e8f3dfdb322febdeff03c0e71c3ed9518711f629'
+
+  depends_on 'autoconf'
+  depends_on 'automake'
+  depends_on 'autoconf-archive'
+  depends_on 'libtool'
+  depends_on 'pkg-config'
+
+  depends_on 'libsodium'
+
+  def install
+    ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig"
+    system "./configure", "--prefix=#{prefix}"
+    system "make"
+    system "make install"
+  end
+end
diff --git a/libpo6.rb b/libpo6.rb
index cd3c124..51ed95f 100644
--- a/libpo6.rb
+++ b/libpo6.rb
@@ -2,8 +2,8 @@
 
 class Libpo6 < Formula
   homepage 'http://hyperdex.org'
-  url 'http://hyperdex.org/src/libpo6-0.5.2.tar.gz'
-  sha1 'dcbce34fe3f1032381e125204168dac71d159ec3'
+  url 'http://hyperdex.org/src/libpo6-0.6.0.tar.gz'
+  sha1 '4bed4124daf33acba0e527c4dc59ccc63c8bbde0'
 
   depends_on 'autoconf'
   depends_on 'automake'
diff --git a/libtreadstone.rb b/libtreadstone.rb
new file mode 100644
index 0000000..619db2d
--- /dev/null
+++ b/libtreadstone.rb
@@ -0,0 +1,40 @@
+require 'formula'
+
+class Libtreadstone < Formula
+  homepage 'http://hyperdex.org'
+  url 'http://hyperdex.org/src/libtreadstone-0.1.0.tar.gz'
+  sha1 '5e34d8c67a2e7c1b3c5a6ade4c5141372297fb0d'
+
+  depends_on 'autoconf'
+  depends_on 'automake'
+  depends_on 'autoconf-archive'
+  depends_on 'libtool'
+  depends_on 'pkg-config'
+
+  depends_on 'libpo6'
+
+  def patches
+    DATA
+  end
+
+  def install
+    ENV['PKG_CONFIG_PATH']="#{HOMEBREW_PREFIX}/lib/pkgconfig"
+    system "./configure", "--prefix=#{prefix}"
+    system "make"
+    system "make install"
+  end
+end
+__END__
+diff --git a/treadstone.cc b/treadstone.cc
+index f4f651b..cf2b884 100644
+--- a/treadstone.cc
++++ b/treadstone.cc
+@@ -1805,7 +1805,7 @@ treadstone_transformer :: parse_array(const treadstone::pa
+     {
+         const unsigned char* const elem_start = tmp;
+         const unsigned char* elem_tmp = NULL;
+-        size_t elem_sz;
++        uint64_t elem_sz;
+
+         switch (*elem_start)
+         {
diff --git a/replicant.rb b/replicant.rb
index cacd705..af31d19 100644
--- a/replicant.rb
+++ b/replicant.rb
@@ -2,8 +2,8 @@
 
 class Replicant < Formula
   homepage 'http://hyperdex.org'
-  url 'http://hyperdex.org/src/replicant-0.6.3.tar.gz'
-  sha1 'e3677d6998623db3fdba4ac834eb69e8be6852c2'
+  url 'http://hyperdex.org/src/replicant-0.6.4.tar.gz'
+  sha1 'bc2527c31ef4671859926fc31b6eb80b9011026e'
 
   depends_on 'autoconf'
   depends_on 'automake'