diff --git a/build.gradle b/build.gradle
index cc11186905..39a37f7784 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'maven'
 
 allprojects {
     group = 'io.digdag'
-    version = '0.9.6-SNAPSHOT'
+    version = '0.9.6'
 
     ext {
         isSnapshotRelease = version.endsWith('-SNAPSHOT')
diff --git a/digdag-cli/src/main/java/io/digdag/cli/SelfUpdate.java b/digdag-cli/src/main/java/io/digdag/cli/SelfUpdate.java
index aba5c98d4f..36d57b3b68 100644
--- a/digdag-cli/src/main/java/io/digdag/cli/SelfUpdate.java
+++ b/digdag-cli/src/main/java/io/digdag/cli/SelfUpdate.java
@@ -90,7 +90,7 @@ public SystemExitException usage(String error)
         err.println("");
         err.println("  Examples:");
         err.println("    $ " + programName + " selfupdate");
-        err.println("    $ " + programName + " selfupdate 0.9.6-SNAPSHOT");
+        err.println("    $ " + programName + " selfupdate 0.9.6");
         err.println("");
         return systemExit(error);
     }
diff --git a/digdag-client/src/main/resources/io/digdag/client/version.txt b/digdag-client/src/main/resources/io/digdag/client/version.txt
index a2869476bd..85b7c695b8 100644
--- a/digdag-client/src/main/resources/io/digdag/client/version.txt
+++ b/digdag-client/src/main/resources/io/digdag/client/version.txt
@@ -1 +1 @@
-0.9.6-SNAPSHOT
+0.9.6
diff --git a/digdag-docs/src/command_reference.rst b/digdag-docs/src/command_reference.rst
index 4137d0e6aa..73abd38f34 100644
--- a/digdag-docs/src/command_reference.rst
+++ b/digdag-docs/src/command_reference.rst
@@ -225,7 +225,7 @@ Updates the executable binary file to the latest version or specified version. E
 .. code-block:: console
 
     $ digdag selfupdate
-    $ digdag selfupdate 0.9.5
+    $ digdag selfupdate 0.9.6
 
 Server-mode commands
 ----------------------------------
diff --git a/digdag-docs/src/releases.rst b/digdag-docs/src/releases.rst
index 2b8cb919b8..4f0f322b21 100644
--- a/digdag-docs/src/releases.rst
+++ b/digdag-docs/src/releases.rst
@@ -5,6 +5,7 @@ Release Notes
     :maxdepth: 1
 
     # add new version here
+    releases/release-0.9.6
     releases/release-0.9.5
     releases/release-0.9.4
     releases/release-0.9.3
diff --git a/digdag-docs/src/releases/release-0.9.6.rst b/digdag-docs/src/releases/release-0.9.6.rst
new file mode 100644
index 0000000000..c7c1ace347
--- /dev/null
+++ b/digdag-docs/src/releases/release-0.9.6.rst
@@ -0,0 +1,22 @@
+Release 0.9.6
+=============
+
+General Changes
+---------------
+
+* ``require>`` operator is fixed so that it fails when dependent workflow fails.
+* Added ``ignore_failure: BOOLEAN`` option to ``require>`` operator. If it is set to true, ``require>`` operator ignores failure of dependent workflow.
+* Added ``result_connection: NAME`` and ``result_settings: {...}`` options to ``td>`` operator.
+* Fixed unexpected duplicated (retried) execution of tasks when ``--max-task-threads`` is set and ``_parallel:`` is used. See `issue #487 <https://github.com/treasure-data/digdag/issues/487>`_ for the detailed condition to reproduce.
+
+Server Changes
+---------------
+
+* Added ``userInfo`` field to ``/api/projects/{id}/revisions``.
+* Added ``index`` field to ``/api/sessions/{id}/attempts``. Index of an attempt is a sequence number (1, 2, 3, ...) in a session. Intention of this change is to obsolete attempt id to avoid confusion from session id.
+* Starting server on admin port is now optional. ``--admin-port`` argument is required to enable admin API.
+* Fixed hard timeout of long-running tasks (1 day). It was killing an attempt if the attempt is running longer than 1 day. Now it kills if a single task is running longer than 1 day. Attempt is killed if it is running longer than 7 days (``executor.attempt_ttl`` and ``executor.task_ttl`` are the configuration parameters of the durations).
+
+Release Date
+------------
+2017-03-14