3.18
diff --git a/new/all.php b/new/all.php
index e574f21..e4d839a 100644
--- a/new/all.php
+++ b/new/all.php
@@ -7,8 +7,13 @@
 
 $versions = array(
 				  array(
+					 "date" => "2016/01/8"
+					, "title" => "<a href=\"showVersion.php?version=new-3.18.html\"><img src=\"../images/star.png\"/>Mylyn 3.18 released</a>"
+					, "description" => "Mylyn 3.18"
+				)
+				, array(
 					 "date" => "2015/10/2"
-					, "title" => "<a href=\"showVersion.php?version=new-3.17.html\"><img src=\"../images/star.png\"/>Mylyn 3.17 released</a>"
+					, "title" => "<a href=\"showVersion.php?version=new-3.17.html\">Mylyn 3.17 released</a>"
 					, "description" => "Mylyn 3.17 released as part of Eclipse Mars.1"
 				)
 				, array(
diff --git a/new/images/3.18/UI_legend.png b/new/images/3.18/UI_legend.png
new file mode 100644
index 0000000..61ec642
--- /dev/null
+++ b/new/images/3.18/UI_legend.png
Binary files differ
diff --git a/new/images/3.18/gerrit-builds.png b/new/images/3.18/gerrit-builds.png
new file mode 100644
index 0000000..809bebf
--- /dev/null
+++ b/new/images/3.18/gerrit-builds.png
Binary files differ
diff --git a/new/new-3.18.html b/new/new-3.18.html
new file mode 100644
index 0000000..01ef472
--- /dev/null
+++ b/new/new-3.18.html
@@ -0,0 +1,265 @@
+<html>
+<body bgcolor="FFFFFF">
+	<table border="1" style="border-collapse: collapse" width="100%"
+		cellpadding="4" bordercolor="#FFFFFF">
+		<tr>
+			<td bgcolor="#595791" width="7%" align="center"><b> <font
+					color="#FFFFFF" size="1">Release</font></b></td>
+			<td bgcolor="#595791" width="5%" align="center"><b> <font
+					color="#FFFFFF" size="1">Resolved </font></b></td>
+			<td bgcolor="#595791" width="5%" align="center"><b> <font
+					color="#FFFFFF" size="1">Merged </font></b></td>
+			<td bgcolor="#595791" width="*" align="center"><b> <font
+					color="#FFFFFF" size="1">Community Contributions</font></b></td>
+		</tr>
+		<tr>
+			<td bgcolor="#EFEFEF"><font size="1">3.18<br> <i>January 8, 2016</i></font></td>
+			<td bgcolor="#EFEFEF" align="center"><a
+				href="https://projects.eclipse.org/projects/mylyn/releases/3.18/plan">
+					<font size="1">37</font><br> <font size="1">bugs</font>
+			</a></td></td>
+			<td bgcolor="#EFEFEF" align="center"><a
+				href="https://git.eclipse.org/r/#/q/mylyn/+status:merged+after:%222015-08-28+13:30:00+-0800%22+%28%28branch:master+before:%222015-12-09+00:00:00+-0800%22%29+OR+%28branch:e_4_5_m_3_18_x+before:2015-12-18%29%29">
+					<font size="1">97</font><br> <font size="1">reviews</font>
+			</a></td>
+			<td bgcolor="#EFEFEF"><font size="1">Community contributions were
+					provided by Landon Butterworth, Amr Dawood, Vaughan Hilts, Blaine Lewis, Chris Poon, Colin Ritchie, Kyle Ross, 
+					and Eric Williams
+					<br>Includes:
+					<a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn;target_milestone=3.18">Mylyn
+						3.18</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Builds;target_milestone=1.10">Mylyn
+						Builds 1.10</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Commons;target_milestone=3.18">Mylyn
+						Commons 3.18</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Context;target_milestone=3.18">Mylyn
+						Context 3.18</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Docs;target_milestone=2.7">Mylyn
+						Docs 2.7</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Reviews;target_milestone=2.9">Mylyn
+						Reviews 2.9</a>. <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Tasks;target_milestone=3.18">Mylyn
+						Tasks 3.18</a>, <a
+					href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;product=Mylyn%20Versions;target_milestone=1.10">Mylyn
+						Versions 1.10</a>.
+			</font></td>
+		</tr>
+	</table>
+
+	<p>
+		<b>Also see the New &amp; Noteworthy for <a href="/mylyn/new/all.php">previous releases</a></b>
+	</p>
+
+	<hr size="1" />
+
+	<p>
+		<b>NOTE:</b> Mylyn 3.18 requires <a
+			href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=423848"
+			target="_new"><b>Java 1.7 or later</b></a> and supports <a
+			href="https://wiki.eclipse.org/Mylyn_Integrator_Reference#Deciding_on_a_version"
+			target="_new"><b>Eclipse 3.8, 4.4 or 4.5</b></a>. See the <a href="/mylyn/downloads/">download
+			page</a> for repository locations.
+	</p>
+	
+	<h3>Supported Repository Versions</h3>
+	<div style="font-size: small;">
+	Connectors included in Mylyn 3.18 support the following repository versions:
+	<ul>
+	<li>Bugzilla 4.0 - 4.4.10, 5.0.1</li>
+	<li>Gerrit 2.9.4 - 2.11.3</li>
+	<li>Hudson 3.0 - 3.3.0</li>
+	<li>Jenkins 1.509 - 1.609</li>
+	</ul>
+	</div>
+	<hr size="1" />
+
+
+	<h1>New	in Mylyn 3.18</h1>
+	
+
+	<ul>
+		<li><a href="#tasks">Task List</a></li>
+		<li><a href="#gerrit">Gerrit Connector</a></li>
+		<li><a href="#builds">Hudson/Jenkins Connector</a></li>
+		<li><a href="#framework">Framework and API</a></li>
+	</ul>
+
+	<h2>
+		<a name="tasks">Task List</a>
+	</h2>
+	<table cellpadding="10" style="border-spacing: 5px 0px; border-collapse: separate;"width="100%">
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b>UI Legend</b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">The task list has a help button which opens the UI Legend to make it easier to discover.</p>
+				<p>
+					<img border="0" src="images/3.18/UI_legend.png" />
+				</p>
+			</td>
+		</tr>
+	</table>
+	
+	<h2>
+		<a name="gerrit">Gerrit Connector</a>
+	</h2>
+	<table cellpadding="10" style="border-spacing: 5px 0px; border-collapse: separate;"width="100%">
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b>Build Status on Patch Sets</b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">The status of builds triggered by a patch set is shown on that patch set instead of appearing as comments. 
+				If the Hudson/Jenkins connector is installed, users can open the test results in the JUnit view directly from the patch set.
+				This may not work if the Gerrit trigger plugin is configured with custom messages.</p>
+				<p>
+					<img border="0" src="images/3.18/gerrit-builds.png" />
+				</p>
+			</td>
+		</tr>
+	</table>
+
+	<p>&nbsp;</p>
+	<h2>
+		<a name="builds">Hudson/Jenkins Connector</a>
+	</h2>
+	<table cellpadding="10" style="border-spacing: 5px 0px; border-collapse: separate;"width="100%">
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b>Workspace File Lookup</b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">Opening files in the workspace from the build editor now supports users who checkout a repository
+				into a project. See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=477092">bug 477092</a> for details.</p>
+			</td>
+		</tr>
+	</table>
+
+
+	<p>&nbsp;</p>
+	<h2>
+		<a name="framework">Framework and API</a>
+	</h2>
+
+	<p>
+		See <a
+			href="https://wiki.eclipse.org/Mylyn/Porting_Guide#Changes_in_3.16"
+			target="_new">porting guide</a> for additional notes on API changes.
+	</p>
+
+	<table cellpadding="10" style="border-spacing: 5px 0px; border-collapse: separate;"width="100%">
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b>Person Properties</b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">Added API to <code>IRepositoryPerson</code> to support storing arbitrary properties. 
+				 Added a <code>PERSON_USERNAME</code> constant to <code>TaskAttribute</code> and a
+				 <code>matchesUsername</code> method to <code>IRepositoryPerson</code> to support connectors where the 
+				 human-readable username is different from the ID used to identify users in task data.  
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=463022">bug 463022</a>.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+			<hr size="1"/>
+			</td>
+		</tr>
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b></b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=482186">bug 482186</a>.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+			<hr size="1"/>
+			</td>
+		</tr>
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b></b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=482633">bug 482633</a>.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+			<hr size="1"/>
+			</td>
+		</tr>
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b></b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=483856">bug 483856</a>.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+			<hr size="1"/>
+			</td>
+		</tr>
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b></b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=483421">bug 483421</a>.
+				</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+			<hr size="1"/>
+			</td>
+		</tr>
+		<tr>
+			<td align="left" valign="top" width="15%" bgcolor="#3D355C" style="color:white;  padding-right: 5px;">
+				<p align="right">
+					<b></b>
+				</p>
+			</td>
+			<td valign="top" width="85%">
+				<p align="left">
+				 See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=483327">bug 483327</a>.
+				</p>
+			</td>
+		</tr>
+	</table>
+	<p>&nbsp;</p>
+
+
+
+</body>
+</html>