diff --git a/_builds/builds-3.17.xml b/_builds/builds-3.17.xml
index 5e55416..a281622 100644
--- a/_builds/builds-3.17.xml
+++ b/_builds/builds-3.17.xml
@@ -65,22 +65,22 @@
 
   <build name="3.17 RC2" type="RC"
       shortname="RC2"
-      status="planned"
+      status="completed"
       publishDate="2021-06-11"
       news="3.17/?build=RC2"
-      runtimeZip=""
-      runtime4Zip=""
-      toolsZip=""
+      runtimeZip="rap-3.17.0-RC2b-20210612-0910.zip"
+      runtime4Zip="rap-e4-3.17.0-RC2b-20210612-0910.zip"
+      toolsZip="rap-tools-3.17.0-RC2b-20210612-0910.zip"
       />
 
   <build name="3.17" type="R"
       shortname="R"
-      status="planned"
+      status="completed"
       publishDate="2021-06-16"
       news="3.17/"
-      runtimeZip=""
-      runtime4Zip=""
-      toolsZip=""
+      runtimeZip="rap-3.17.0-R-20210612-0910.zip"
+      runtime4Zip="rap-e4-3.17.0-R-20210612-0910.zip"
+      toolsZip="rap-tools-3.17.0-R-20210612-0910.zip"
       />
 
 </builds>
diff --git a/_sidebar/arrivals.php b/_sidebar/arrivals.php
index 3c40bb5..91f0994 100644
--- a/_sidebar/arrivals.php
+++ b/_sidebar/arrivals.php
@@ -7,17 +7,6 @@
     <div class="terminal-row">
       <span class="terminal-field">
         <span class="terminal-overlay"></span>
-        <span class="terminal-text">RAP 3.15.1</span>
-      </span>
-      <span class="terminal-field">
-        <span class="terminal-overlay"></span>
-        <span class="terminal-text terminal-arrived">ARRIVED</span>
-      </span>
-    </div>
-
-    <div class="terminal-row">
-      <span class="terminal-field">
-        <span class="terminal-overlay"></span>
         <span class="terminal-text">RAP 3.16</span>
       </span>
       <span class="terminal-field">
@@ -29,22 +18,33 @@
     <div class="terminal-row">
       <span class="terminal-field">
         <span class="terminal-overlay"></span>
-        <span class="terminal-text">RAP 3.17 RC1</span>
+        <span class="terminal-text">RAP 3.17</span>
       </span>
       <span class="terminal-field">
         <span class="terminal-overlay"></span>
-        <span class="terminal-text">2021-06-04</span>
+        <span class="terminal-text terminal-arrived">ARRIVED</span>
       </span>
     </div>
 
     <div class="terminal-row">
       <span class="terminal-field">
         <span class="terminal-overlay"></span>
-        <span class="terminal-text">RAP 3.17</span>
+        <span class="terminal-text">RAP 3.18 M1</span>
       </span>
       <span class="terminal-field">
         <span class="terminal-overlay"></span>
-        <span class="terminal-text">2021-06-16</span>
+        <span class="terminal-text">2021-07-16</span>
+      </span>
+    </div>
+
+    <div class="terminal-row">
+      <span class="terminal-field">
+        <span class="terminal-overlay"></span>
+        <span class="terminal-text">RAP 3.18</span>
+      </span>
+      <span class="terminal-field">
+        <span class="terminal-overlay"></span>
+        <span class="terminal-text">2021-09-15</span>
       </span>
     </div>
 
diff --git a/developers-guide/DevGuideUtils.php b/developers-guide/DevGuideUtils.php
index 27f31f7..b889f96 100644
--- a/developers-guide/DevGuideUtils.php
+++ b/developers-guide/DevGuideUtils.php
@@ -2,7 +2,7 @@
 
 class DevGuideUtils {
 
-  const CURRENT_VERSION = '3.16';
+  const CURRENT_VERSION = '3.17';
   const MASTER_VERSION = '3.17';
 
   public static $versions = array(
diff --git a/downloads/index.php b/downloads/index.php
index 89b94f7..6ece60a 100644
--- a/downloads/index.php
+++ b/downloads/index.php
@@ -9,7 +9,7 @@
 
   // --- TO BE CHANGED WITH EVERY RELEASE ---
 
-  $releaseBuilds = new Builds( "3.16" );
+  $releaseBuilds = new Builds( "3.17" );
   $stableBuilds = new Builds( "3.17" );
 
   // ---