diff --git a/pom.xml b/pom.xml
index b17fe70a..d74d1551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.zkoss.theme</groupId>
 	<artifactId>atlantic</artifactId>
-	<version>8.5.0-SNAPSHOT</version>
+	<version>8.5.0</version>
 	<properties>
 		<zk.version>8.0.4-Eval</zk.version>
 		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
diff --git a/zkdoc/release-note b/zkdoc/release-note
index 66fdd088..d708e502 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -1,4 +1,5 @@
 Atlantic 8.5.0
+Oct 31, 2017
 * Features:
   ZK-3336: tbeditor version update
   ZK-3683: Add a new Splitlayout component
@@ -10,6 +11,7 @@ Atlantic 8.5.0
   ZK-3783: panel/window close button markup/style inconsistent
 
 * Upgrade Notes:
+  + The version number is aligned with ZK Framework.
 
   --------
 Atlantic 1.1.6