diff --git a/build.gradle b/build.gradle
index 84aa94d293..5f7a49ded3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'maven'
 
 allprojects {
     group = 'io.digdag'
-    version = '0.9.18-SNAPSHOT'
+    version = '0.9.18'
 
     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 cf5665895c..418b194886 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.18-SNAPSHOT");
+        err.println("    $ " + programName + " selfupdate 0.9.18");
         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 fcd2cdf346..7a50b68105 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.18-SNAPSHOT
+0.9.18
diff --git a/digdag-docs/src/command_reference.rst b/digdag-docs/src/command_reference.rst
index 7d1b9aed1b..a490a6b548 100644
--- a/digdag-docs/src/command_reference.rst
+++ b/digdag-docs/src/command_reference.rst
@@ -230,7 +230,7 @@ Updates the executable binary file to the latest version or specified version. E
 .. code-block:: console
 
     $ digdag selfupdate
-    $ digdag selfupdate 0.9.17
+    $ digdag selfupdate 0.9.18
 
 Server-mode commands
 ----------------------------------
diff --git a/digdag-docs/src/releases.rst b/digdag-docs/src/releases.rst
index d1f85212b7..734ac66c47 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.18
     releases/release-0.9.17
     releases/release-0.9.16
     releases/release-0.9.15
diff --git a/digdag-docs/src/releases/release-0.9.18.rst b/digdag-docs/src/releases/release-0.9.18.rst
new file mode 100644
index 0000000000..8da4ede243
--- /dev/null
+++ b/digdag-docs/src/releases/release-0.9.18.rst
@@ -0,0 +1,45 @@
+Release 0.9.18
+==============
+
+Operator Changes
+------------------
+
+* Added new ``for_range>`` operator. See documents for its usage.
+
+* ``pg>`` and ``redshift>`` operators support ``store_last_results`` option so that following tasks can use results of a query.
+
+
+UI Changes
+------------------
+
+* Added ``KILL`` button on attempt details pages.
+
+* Fixed a problem around showing task logs that was happening when a task name contains URL special characters.
+
+* Fixed a problem around showing task logs and workflow definitions that was happening when a server requires credentials in HTTP requests.
+
+
+CLI Changes
+------------------
+
+* Fixed ``digdag secrets --set`` command so that it overwrites an existent secret string longer than the new value.
+
+
+Server mode changes
+---------------------
+
+* Added ``archive.s3.path-style-access`` and ``log-server.s3.path-style-access`` options to so that project archive files and task log files can be stored on S3-compatible data stores such as Ceph, Minio, and Riak CS.
+
+
+Release Date
+------------
+2017-10-11
+
+Contributors
+------------
+* Mitsunori Komatsu
+* Sadayuki Furuhashi
+* Shota Suzuki
+* Takahiro INOUE
+* szyn
+