diff --git a/src/main/java/com/basho/riak/client/api/RiakClient.java b/src/main/java/com/basho/riak/client/api/RiakClient.java
index 114c31b38..d5ff3ac54 100644
--- a/src/main/java/com/basho/riak/client/api/RiakClient.java
+++ b/src/main/java/com/basho/riak/client/api/RiakClient.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.lang.AutoCloseable;
 
 /**
  * <script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js"></script>
@@ -158,7 +159,7 @@
  * @author Sergey Galkin <srggal at gmail dot com>
  * @since 2.0
  */
-public class RiakClient
+public class RiakClient implements AutoCloseable
 {
     private final RiakCluster cluster;
 
@@ -416,6 +417,18 @@ public Future<Boolean> shutdown()
         return cluster.shutdown();
     }
 
+
+    /**
+     * Implementation of the AutoCloseable-Inteface.
+     * <p>
+     *     The Client will be automatically shut down when used with try-with-resource statement
+     * </p>
+     */
+    @Override
+    public void close() throws ExecutionException, InterruptedException {
+        this.shutdown().get();
+    }
+
     /**
      * Get the RiakCluster being used by this client.
      * <p>