diff --git a/download.html b/download.html
index a2b3517..3a49d22 100644
--- a/download.html
+++ b/download.html
@@ -95,6 +95,50 @@
 			<script type="text/javascript" src="https://www.openhub.net/p/612690/widgets/project_users_logo.js"></script>
 		</p>
 
+		<h4>1.18.x Milestone Builds</h4>
+        <div class="row-fluid">
+            <div class="span12 text-center">
+                <b>
+                When updating to this version, please have a look at our migration guide:  <a href="http://eclipsesource.com/blogs/tutorials/emf-forms-migration-guide/">EMFForms Migration Guide</a>.
+                </b>
+            </div>
+        </div>
+        <div class="row-fluid">
+
+            <div class="span6 text-center">
+                <button type="button" class="btn btn-primary"
+                    data-toggle="collapse" data-target="#copied1180URL">Update
+                    Site</button>
+                <div id="copied1180URL" class="collapse out">
+                    Please copy this URL:
+                    <div class="well" style="padding: 0.5em; color: #333333">
+                        http://download.eclipse.org/ecp/releases/releases_118/</div>
+                    <ol>
+                        <li>Navigate to <em>Help &rarr; Install New Software</em>
+                        <li>Paste the copied URL into the text field label with
+                            "Work with" and press enter</li>
+                        <li>Select the features, you want to install (<b>if you
+                                are unsure: the "EMF Forms SDK"</b>). Please also visit our <a
+                            href="documentation.html">documentation</a> for more information
+                        </li>
+                        <li>Accept the license agreement and finish the installation</li>
+                    </ol>
+                </div>
+            </div>
+
+            <div class="span6 text-center">
+                <button type="button" class="btn btn-primary"
+                        data-toggle="collapse" data-target="#copied1180URL_target">Target Platform Update
+                    Site</button>
+                <div id="copied1180URL_target" class="collapse out" style="padding-left: 1em;">
+                    Please copy this URL:
+                    <div class="well" style="padding: 0.5em; color: #333333">
+                        http://download.eclipse.org/ecp/releases/releases_target_118/</div>
+                    <b>DO NOT INSTALL THIS INTO YOUR IDE. THIS IS MEANT ONLY FOR YOUR TARGET PLATFORM!</b>
+                </div>
+            </div>
+        </div>
+
 		<h4>1.17.x Service Releases</h4>
 		<div class="row-fluid">
 			<div class="span12 text-center">
@@ -841,6 +885,7 @@
 		</div>
 
 		<!-- Nighlty End -->
+		<!-- 
         <h4>1.18.x Milestone Builds</h4>
         <div class="row-fluid">
             <div class="span12 text-center">
@@ -884,6 +929,7 @@
                 </div>
             </div>
         </div>
+        -->
 		<h4>Single Releases</h4>
 		Below you find a list of older releases you may download as a ZIP
 		archive.
@@ -895,16 +941,11 @@
 			<div class="span3 text-center"><b>API/SPI Changes</b></div>
 		</div>
 		<div class="row-fluid">
-			<!-- 
-            <div class="span3 text-center">
-                <a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_118/1170/1170.zip">1.17.0</a>
-			</div>
-			-->
 			<div class="span3 text-center">
-				<a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_target_118/1180_M2/1180_M2.zip">Target Platform 1.18.0 M2</a>
+                <a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_118/1180_M3/1180_M3.zip">1.18.0 M3</a>
 			</div>
 			<div class="span3 text-center">
-				<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=ECP&target_milestone=1.18.0">Changelog 1.18.0</a>
+				<a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_target_118/1180_M3/1180_M3.zip">Target Platform 1.18.0 M3</a>
 			</div>
 			<!-- 
             <div class="span3 text-center">
diff --git a/emfforms/download.html b/emfforms/download.html
index c945d3c..c7f3da4 100644
--- a/emfforms/download.html
+++ b/emfforms/download.html
@@ -92,7 +92,49 @@
 			<script type="text/javascript" src="https://www.openhub.net/p/713609/widgets/project_users_logo.js"></script>
 
 		</p>
+<h4>1.18.x Milestone Builds</h4>
+        <div class="row-fluid">
+            <div class="span12 text-center">
+                <b>
+                When updating to this version, please have a look at our migration guide:  <a href="http://eclipsesource.com/blogs/tutorials/emf-forms-migration-guide/">EMFForms Migration Guide</a>.
+                </b>
+            </div>
+        </div>
+        <div class="row-fluid">
 
+            <div class="span6 text-center">
+                <button type="button" class="btn btn-primary"
+                    data-toggle="collapse" data-target="#copied1180URL">Update
+                    Site</button>
+                <div id="copied1180URL" class="collapse out">
+                    Please copy this URL:
+                    <div class="well" style="padding: 0.5em; color: #333333">
+                        http://download.eclipse.org/ecp/releases/releases_118/</div>
+                    <ol>
+                        <li>Navigate to <em>Help &rarr; Install New Software</em>
+                        <li>Paste the copied URL into the text field label with
+                            "Work with" and press enter</li>
+                        <li>Select the features, you want to install (<b>if you
+                                are unsure: the "EMF Forms SDK"</b>). Please also visit our <a
+                            href="documentation.html">documentation</a> for more information
+                        </li>
+                        <li>Accept the license agreement and finish the installation</li>
+                    </ol>
+                </div>
+            </div>
+
+            <div class="span6 text-center">
+                <button type="button" class="btn btn-primary"
+                        data-toggle="collapse" data-target="#copied1180URL_target">Target Platform Update
+                    Site</button>
+                <div id="copied1180URL_target" class="collapse out" style="padding-left: 1em;">
+                    Please copy this URL:
+                    <div class="well" style="padding: 0.5em; color: #333333">
+                        http://download.eclipse.org/ecp/releases/releases_target_118/</div>
+                    <b>DO NOT INSTALL THIS INTO YOUR IDE. THIS IS MEANT ONLY FOR YOUR TARGET PLATFORM!</b>
+                </div>
+            </div>
+        </div>
 		<h4>1.17.x Service Releases</h4>
 		<div class="row-fluid">
 			<div class="span12 text-center">
@@ -785,7 +827,7 @@
 		</div>
 
 		<!-- Nighlty End -->
-		
+		<!-- 
         <h4>1.18.x Milestone Builds</h4>
         <div class="row-fluid">
             <div class="span12 text-center">
@@ -829,6 +871,7 @@
                 </div>
             </div>
         </div>
+        -->
 		<h4>Single Releases</h4>
 		<p>
 			Below you find a list of older releases you may download as a ZIP
@@ -843,13 +886,11 @@
 			<div class="span3 text-center"><b>API/SPI Changes</b></div>
 		</div>
 		<div class="row-fluid">
-			<!-- 
             <div class="span3 text-center">
-                <a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_118/1170/1170.zip">1.17.0</a>
+                <a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_118/1180_M3/1180_M3.zip">1.18.0 M3</a>
 			</div>
-			-->
 			<div class="span3 text-center">
-				<a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_target_118/1180_M2/1180_M2.zip">Target Platform 1.18.0 M2</a>
+				<a href="http://www.eclipse.org/downloads/download.php?file=/ecp/releases/releases_target_118/1180_M3/1180_M3.zip">Target Platform 1.18.0 M3</a>
 			</div>
 			<div class="span3 text-center">
 				<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=ECP&target_milestone=1.18.0">Changelog 1.18.0</a>