diff --git a/_config.yml b/_config.yml
index 5b61816..9806fb3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,10 +1,10 @@
 url: ""
 name: "Apache AsterixDB"
 
-STABLE_VERSION: 0.9.5
-UNSTABLE_VERSION: 0.9.5-SNAPSHOT
-STABLE_NCSERVICE_URL: "http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.5/asterix-server-0.9.5-binary-assembly.zip"
-UNSTABLE_NCSERVICE_URL: "https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/lastSuccessfulBuild/org.apache.asterix$asterix-server/artifact/org.apache.asterix/asterix-server/0.9.5-SNAPSHOT/asterix-server-0.9.5-SNAPSHOT-binary-assembly.zip"
+STABLE_VERSION: 0.9.6
+UNSTABLE_VERSION: 0.9.6-SNAPSHOT
+STABLE_NCSERVICE_URL: "http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.6/asterix-server-0.9.6-binary-assembly.zip"
+UNSTABLE_NCSERVICE_URL: "https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/lastSuccessfulBuild/org.apache.asterix$asterix-server/artifact/org.apache.asterix/asterix-server/0.9.6-SNAPSHOT/asterix-server-0.9.6-SNAPSHOT-binary-assembly.zip"
 DOCS_BASE_URL: "docs"
 UNSTABLE_DOCS_BASE_URL: "https://ci.apache.org/projects/asterixdb/"
 
diff --git a/content/about.html b/content/about.html
index f79be01..537bb33 100644
--- a/content/about.html
+++ b/content/about.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
diff --git a/content/community.html b/content/community.html
index fc00153..8e3a35f 100644
--- a/content/community.html
+++ b/content/community.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
diff --git a/content/dev-setup.html b/content/dev-setup.html
index 7d543bf..1a05df2 100644
--- a/content/dev-setup.html
+++ b/content/dev-setup.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
@@ -149,7 +149,7 @@
 <p>If you are a developer simply looking for a snapshot of the latest development version of AsterixDB to test out your application that is based on top of AsterixDB, snapshots from the latest successful push to our master branch are available below. These are non ASF-release, automatic builds.</p>
 
 <h3 id="server-package">Server Package</h3>
-<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/lastSuccessfulBuild/org.apache.asterix$asterix-server/artifact/org.apache.asterix/asterix-server/0.9.5-SNAPSHOT/asterix-server-0.9.5-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.9.5-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
+<p><a class="btn btn-md btn-warning" href="https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/lastSuccessfulBuild/org.apache.asterix$asterix-server/artifact/org.apache.asterix/asterix-server/0.9.6-SNAPSHOT/asterix-server-0.9.6-SNAPSHOT-binary-assembly.zip" role="button">Download AsterixDB 0.9.6-SNAPSHOT <i class="fa fa-download fa-lg"></i> </a></p>
 
 <hr />
 
diff --git a/content/download.html b/content/download.html
index 9406253..908342a 100644
--- a/content/download.html
+++ b/content/download.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
@@ -146,7 +146,7 @@
 
 <div class="col-md-6">
 
-    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.5/asterix-server-0.9.5-binary-assembly.zip" role="button">Download AsterixDB 0.9.5 <i class="fa fa-download fa-lg"></i> </a></p>
+    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.6/asterix-server-0.9.6-binary-assembly.zip" role="button">Download AsterixDB 0.9.6 <i class="fa fa-download fa-lg"></i> </a></p>
 
   </div>
 
diff --git a/content/extension.html b/content/extension.html
index 4d6de92..86b7850 100644
--- a/content/extension.html
+++ b/content/extension.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
diff --git a/content/index.html b/content/index.html
index af2bd94..348e55d 100644
--- a/content/index.html
+++ b/content/index.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
@@ -114,19 +114,19 @@
   <div class="col-lg-4">
     <h3 id="key-features">Key Features</h3>
     <ul>
-      <li><a href="docs/0.9.5/aql/datamodel.html"><strong>Flexible</strong></a> data model</li>
+      <li><a href="docs/0.9.6/aql/datamodel.html"><strong>Flexible</strong></a> data model</li>
       <li><a href="http://asterix.ics.uci.edu/pub/vldb14-storage.pdf"><strong>Distributed</strong></a> storage and transaction</li>
-      <li><a href="docs/0.9.5/feeds/tutorial.html"><strong>Fast</strong></a> data ingestion</li>
+      <li><a href="docs/0.9.6/feeds/tutorial.html"><strong>Fast</strong></a> data ingestion</li>
       <li><a href="http://asterix.ics.uci.edu/pub/ICDE11_conf_full_690.pdf"><strong>Scalable</strong></a>, data-parallel query execution runtime</li>
-      <li><a href="docs/0.9.5/aql/manual.html"><strong>Declarative</strong></a> query language</li>
+      <li><a href="docs/0.9.6/aql/manual.html"><strong>Declarative</strong></a> query language</li>
     </ul>
 
     <p><strong>AsterixDB</strong> supports various storage and indexing options:</p>
 
     <ul>
-      <li><a href="docs/0.9.5/aql/primer.html"><strong>Managed datasets</strong></a>, internal LSM-based storage</li>
-      <li><a href="docs/0.9.5/aql/externaldata.html"><strong>External datasets</strong></a>, e.g., data on HDFS</li>
-      <li><a href="docs/0.9.5/aql/primer.html"><strong>Secondary indexes</strong></a>, for both storage options.</li>
+      <li><a href="docs/0.9.6/aql/primer.html"><strong>Managed datasets</strong></a>, internal LSM-based storage</li>
+      <li><a href="docs/0.9.6/aql/externaldata.html"><strong>External datasets</strong></a>, e.g., data on HDFS</li>
+      <li><a href="docs/0.9.6/aql/primer.html"><strong>Secondary indexes</strong></a>, for both storage options.</li>
     </ul>
 
   </div>
@@ -191,11 +191,11 @@
   </div>
   <div class="col-md-4">
     <h3 id="download">Download</h3>
-    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.5/asterix-server-0.9.5-binary-assembly.zip" role="button">Download AsterixDB 0.9.5 <i class="fa fa-download fa-lg"></i></a>
+    <p><a class="btn btn-md btn-success" href="http://www.apache.org/dyn/closer.lua/asterixdb/asterixdb-0.9.6/asterix-server-0.9.6-binary-assembly.zip" role="button">Download AsterixDB 0.9.6 <i class="fa fa-download fa-lg"></i></a>
       <a class="btn btn-md btn-info" href="https://github.com/apache/asterixdb/" role="button">GitHub <i class="fa fa-github fa-lg"></i></a></p>
-    <p><a href="docs/0.9.5/ncservice.html">Installation Guide</a></p>
+    <p><a href="docs/0.9.6/ncservice.html">Installation Guide</a></p>
 
-    <p><a href="docs/0.9.5/sqlpp/primer.html">AsterixDB 101</a></p>
+    <p><a href="docs/0.9.6/sqlpp/primer.html">AsterixDB 101</a></p>
   </div>
 </div>
 
diff --git a/content/pushing.html b/content/pushing.html
index 6f65996..9505ebe 100644
--- a/content/pushing.html
+++ b/content/pushing.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
diff --git a/content/site.html b/content/site.html
index 08bf13b..a79f677 100644
--- a/content/site.html
+++ b/content/site.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
diff --git a/content/tools.html b/content/tools.html
index 3315be2..400d8df 100644
--- a/content/tools.html
+++ b/content/tools.html
@@ -53,10 +53,10 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   <li class="dropdown-header">Stable release</li>
-                  <li><a href="docs/0.9.5/index.html">Documentation for 0.9.5<i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="docs/0.9.6/index.html">Documentation for 0.9.6<i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Snapshot release</li>
-                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.5-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
+                  <li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.9.6-SNAPSHOT  <i class="fa fa-external-link fa-sm"></i></a></li>
                   <li class="divider"></li>
                   <li class="dropdown-header">Tutorial for SQL Users</li>
                   <li><a href="files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>