diff --git a/changelog.html b/changelog.html
index a07bb6c40c250bef9b9c4e614b1516ae630ebc24..95abae95836f355d7ef53879a70b24f1a9733a74 100644
--- a/changelog.html
+++ b/changelog.html
@@ -71,6 +71,11 @@ Upcoming changes</a>
   <li class=bug>
     Breadcrumb bar moves away from header when scrolling past end of page on OS X.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19803">issue 19803</a>)
+  <li class='major rfe'>
+    "java -jar jenkins.war" now runs on Jetty8. Command line options are still compatible.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18366">issue 18366</a>)
+  <li class=rfe>
+    "java -jar jenkins.war" gets the "--spdy" option to enable SPDY.
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/pom.xml b/pom.xml
index 7cff659191288833c286eace8eab11443f87e7b5..d2def83e6788d6cb0dd167ada100ba6fec40289b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,6 +630,9 @@ THE SOFTWARE.
                 </requireMavenVersion>
                 <enforceBytecodeVersion>
                   <maxJdkVersion>1.${java.level}</maxJdkVersion>
+                  <ignoreClasses>
+                    <ignoreClass>org.eclipse.jetty.spdy.*</ignoreClass>
+                  </ignoreClasses>
                 </enforceBytecodeVersion>
               </rules>
             </configuration>
@@ -654,7 +657,7 @@ THE SOFTWARE.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-alpha-5</version>
+            <version>1.0-beta-1+kohsuke</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/war/pom.xml b/war/pom.xml
index c9d24474d5fc6cbe08bbc2a088fa986ddc7c86e5..7c6e23c89dc37ed79bec272da8b84f1b09b29e3e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,7 +51,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>executable-war</artifactId>
-      <version>1.28</version>
+      <version>1.29</version>
       <scope>provided</scope>
     </dependency>
 
@@ -103,7 +103,7 @@ THE SOFTWARE.
       -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>0.9.10-jenkins-47</version>
+      <version>2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>