diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java b/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java
index 6d5a8ce..e475c1b 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java
@@ -22,14 +22,16 @@ import org.springframework.util.Assert;
 
 /**
  * Value object to represent an individual release train iteration.
- * 
+ *
  * @author Oliver Gierke
  * @author Mark Paluch
  */
 @Value
 public class Iteration {
 
-	public static final Iteration SR16 = new Iteration("SR16", null);
+	public static final Iteration SR18 = new Iteration("SR18", null);
+	public static final Iteration SR17 = new Iteration("SR17", SR18);
+	public static final Iteration SR16 = new Iteration("SR16", SR17);
 	public static final Iteration SR15 = new Iteration("SR15", SR16);
 	public static final Iteration SR14 = new Iteration("SR14", SR15);
 	public static final Iteration SR13 = new Iteration("SR13", SR14);
@@ -70,7 +72,7 @@ public class Iteration {
 	/**
 	 * Returns whether the {@link Iteration} is considered public, i.e. the artifacts produced by the iteration are
 	 * supposed to be published to Maven Central.
-	 * 
+	 *
 	 * @return
 	 */
 	public boolean isPublic() {
@@ -79,7 +81,7 @@ public class Iteration {
 
 	/**
 	 * Returns whether the current Iteration is going to produce a preview release, i.e. a milestone or release candidate.
-	 * 
+	 *
 	 * @return
 	 */
 	public boolean isPreview() {
diff --git a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
index ca66655..5adfb3d 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
@@ -52,10 +52,10 @@ public class ReleaseTrains {
 		Iteration M2 = new Iteration("M2", M3);
 		Iteration M1 = new Iteration("M1", M2);
 
-		Iterations kayIterations = new Iterations(M1, M2, M3, M4, RC1, RC2, RC3, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9);
+		Iterations kayIterations = new Iterations(M1, M2, M3, M4, RC1, RC2, RC3, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10, SR11, SR12, SR13, SR14, SR15);
 		KAY = INGALLS.next("Kay", Transition.MAJOR, new Module(GEODE, "2.0")).withIterations(kayIterations);
 
-		Iterations lovelaceIterations = new Iterations(M1, M2, M3, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7);
+		Iterations lovelaceIterations = new Iterations(M1, M2, M3, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10);
 		LOVELACE = KAY.next("Lovelace", Transition.MINOR, new Module(JDBC, "1.0"), new Module(SOLR, "4.0"))
 				.withIterations(lovelaceIterations);
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Train.java b/release-tools/src/main/java/org/springframework/data/release/model/Train.java
index e45209a..2ef03bd 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/Train.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/Train.java
@@ -58,7 +58,7 @@ public class Train implements Streamable<Module> {
 		this(name, Modules.of(modules), Iterations.DEFAULT, false);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Iterable#iterator()
 	 */
@@ -83,7 +83,7 @@ public class Train implements Streamable<Module> {
 
 	/**
 	 * Returns the {@link Module} for the given {@link Project} in the current release {@link Train}.
-	 * 
+	 *
 	 * @param project must not be {@literal null}.
 	 * @return
 	 * @throws IllegalArgumentException in case no {@link Module} can be found for the given {@link Project} in the
@@ -99,7 +99,7 @@ public class Train implements Streamable<Module> {
 
 	/**
 	 * Returns the {@link Module} for the given {@link Project} in the current release {@link Train}.
-	 * 
+	 *
 	 * @param project must not be {@literal null}.
 	 * @return the {@link Module} wrapped into an {@link Optional} if present, {@link Optional#empty()} otherwise.
 	 */
@@ -178,7 +178,7 @@ public class Train implements Streamable<Module> {
 
 	/**
 	 * Value object to represent a set of {@link Iteration}s.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	@EqualsAndHashCode
@@ -186,13 +186,13 @@ public class Train implements Streamable<Module> {
 	public static class Iterations implements Iterable<Iteration> {
 
 		public static Iterations DEFAULT = new Iterations(M1, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10,
-				SR11, SR12, SR13, SR14, SR15, SR16);
+				SR11, SR12, SR13, SR14, SR15, SR16, SR17, SR18);
 
 		private final List<Iteration> iterations;
 
 		/**
 		 * Creates a new {@link Iterations} from the given {@link Iteration}.
-		 * 
+		 *
 		 * @param iterations
 		 */
 		Iterations(Iteration... iterations) {
@@ -201,7 +201,7 @@ public class Train implements Streamable<Module> {
 
 		/**
 		 * Returns the iteration with the given name.
-		 * 
+		 *
 		 * @param name must not be {@literal null} or empty.
 		 * @return
 		 */
@@ -223,7 +223,7 @@ public class Train implements Streamable<Module> {
 							String.format("Could not find previous iteration for %s!", iteration)));
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see java.lang.Iterable#iterator()
 		 */