diff --git a/build.gradle b/build.gradle
index d472dbc25b7..016aa76bb7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ configure(subprojects.findAll { it.name != 'util' }) {
     evaluationDependsOn(':util')
 
     group = 'org.mongodb'
-    version = '3.6.0-SNAPSHOT'
+    version = '3.6.0'
     sourceCompatibility = JavaVersion.VERSION_1_6
     targetCompatibility = JavaVersion.VERSION_1_6
 
diff --git a/docs/landing/data/releases.toml b/docs/landing/data/releases.toml
index 98b08cac01a..99a607418bf 100644
--- a/docs/landing/data/releases.toml
+++ b/docs/landing/data/releases.toml
@@ -1,13 +1,13 @@
-current = "3.5.0"
+current = "3.6.0"
 
 [[versions]]
-  version = "3.6.0-rc1"
+  version = "3.6.0"
+  status = "current"
   docs = "./3.6"
   api = "./3.6/javadoc"
 
 [[versions]]
   version = "3.5.0"
-  status = "current"
   docs = "./3.5"
   api = "./3.5/javadoc"
 
@@ -49,19 +49,19 @@ current = "3.5.0"
 [[drivers]]
   name = "mongodb-driver"
   description = "The synchronous driver, new in 3.0.<br/>For older versions of the driver or for OSGi-based applications please use the `mongo-java-driver`."
-  versions = "3.6.0-rc1,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
+  versions = "3.6.0,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
 
 [[drivers]]
   name = "mongo-java-driver"
   description = "An uber jar containing the bson library, the core library and the mongodb-driver.<br/>This artifact is a valid OSGi bundle."
-  versions = "3.6.0-rc1,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4,2.14.2,2.13.3"
+  versions = "3.6.0,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4,2.14.2,2.13.3"
 
 [[drivers]]
   name = "mongodb-driver-async"
   description = "The new asynchronous driver, new in 3.0"
-  versions = "3.6.0-rc1,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
+  versions = "3.6.0,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
 
 [[drivers]]
   name = "mongodb-driver-core"
   description = "The core library, new in 3.0"
-  versions = "3.6.0-rc1,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
+  versions = "3.6.0,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
diff --git a/docs/reference/content/bson/installation-guide.md b/docs/reference/content/bson/installation-guide.md
index 8c324db08e0..db2c6bedbca 100644
--- a/docs/reference/content/bson/installation-guide.md
+++ b/docs/reference/content/bson/installation-guide.md
@@ -22,4 +22,4 @@ This library comprehensively supports [BSON](http://www.bsonspec.org),
 the data storage and network transfer format that MongoDB uses for "documents".
 BSON is short for Binary [JSON](http://json.org/), is a binary-encoded serialization of JSON-like documents.
 
-{{< install artifactId="bson" version="3.6.0-rc1" >}}
+{{< install artifactId="bson" version="3.6.0" >}}
diff --git a/docs/reference/content/driver-async/getting-started/installation.md b/docs/reference/content/driver-async/getting-started/installation.md
index b933dfc887c..4a422cec4da 100644
--- a/docs/reference/content/driver-async/getting-started/installation.md
+++ b/docs/reference/content/driver-async/getting-started/installation.md
@@ -23,4 +23,4 @@ The MongoDB Async Driver requires either [Netty](http://netty.io/) or Java 7.
 
 The MongoDB Async Driver provides asynchronous API that can leverage either Netty or Java 7's AsynchronousSocketChannel for fast and non-blocking I/O.
 
-{{< install artifactId="mongodb-driver-async" version="3.6.0-rc1" dependencies="true">}}
+{{< install artifactId="mongodb-driver-async" version="3.6.0" dependencies="true">}}
diff --git a/docs/reference/content/driver/getting-started/installation.md b/docs/reference/content/driver/getting-started/installation.md
index b95222b1f80..f984bc80897 100644
--- a/docs/reference/content/driver/getting-started/installation.md
+++ b/docs/reference/content/driver/getting-started/installation.md
@@ -29,7 +29,7 @@ For OSGi-based applications, use the [mongo-java-driver](#uber-jar-legacy) uber
 
 {{% /note %}}
 
-{{< install artifactId="mongodb-driver" version="3.6.0-rc1" dependencies="true">}}
+{{< install artifactId="mongodb-driver" version="3.6.0" dependencies="true">}}
 
 
 ## Uber Jar (Legacy)
@@ -41,4 +41,4 @@ For new applications, the preferred artifact is [mongodb-driver](#mongodb-driver
 The `mongo-java-driver` artifact is a valid OSGi bundle.
 {{% /note %}}
 
-{{< install artifactId="mongo-java-driver" version="3.6.0-rc1">}}
+{{< install artifactId="mongo-java-driver" version="3.6.0">}}
diff --git a/docs/reference/content/driver/tutorials/jndi.md b/docs/reference/content/driver/tutorials/jndi.md
index 5596c8f6ff5..7bafe082bb2 100644
--- a/docs/reference/content/driver/tutorials/jndi.md
+++ b/docs/reference/content/driver/tutorials/jndi.md
@@ -28,7 +28,7 @@ The configuration of the `MongoClientFactory` differs depending on the applicati
 
         <module xmlns="urn:jboss:module:1.3" name="org.mongodb">
            <resources>
-               <resource-root path="mongo-java-driver-3.6.0-rc1.jar"/>
+               <resource-root path="mongo-java-driver-3.6.0.jar"/>
            </resources>
            <dependencies>
                <module name="javax.api"/>