7 files changed, 44 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml
index bde450e4c..cc1250e21 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -836,7 +836,7 @@ ant -propertyfile XXX publishtomaven
 
 
   <target name="publishtomaven_milestone" depends="maven.init">
-    <property name="suffix" value="1.8.0.M1"/>
+    <property name="suffix" value="1.8.11.RC1"/>
 
     <property name="build.root" value="/Users/aclement/gits/org.aspectj/aj-build"/>
     <property name="adjusted.release.type" value="milestone"/>
diff --git a/build/usedForMavenUpload_milestone/aspectjrt.pom b/build/usedForMavenUpload_milestone/aspectjrt.pom
index 8ef7e1014..3294faa32 100644
--- a/build/usedForMavenUpload_milestone/aspectjrt.pom
+++ b/build/usedForMavenUpload_milestone/aspectjrt.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.RC3</version>
+  <version>1.8.11.RC1</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjtools.pom b/build/usedForMavenUpload_milestone/aspectjtools.pom
index e834dc7eb..37f29d136 100644
--- a/build/usedForMavenUpload_milestone/aspectjtools.pom
+++ b/build/usedForMavenUpload_milestone/aspectjtools.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.RC3</version>
+  <version>1.8.11.RC1</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjweaver.pom b/build/usedForMavenUpload_milestone/aspectjweaver.pom
index 4667290dd..fd2dbc976 100644
--- a/build/usedForMavenUpload_milestone/aspectjweaver.pom
+++ b/build/usedForMavenUpload_milestone/aspectjweaver.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.RC3</version>
+  <version>1.8.11.RC1</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>
diff --git a/docs/dist/doc/README-1811.html b/docs/dist/doc/README-1811.html
new file mode 100644
index 000000000..e4ca44ee5
--- /dev/null
+++ b/docs/dist/doc/README-1811.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html> <head>
+<title>AspectJ 1.8.11 Readme</title>
+<style type="text/css">
+<!--
+  P   { margin-left:  20px; }
+  PRE { margin-left:  20px; }
+  LI  { margin-left:  20px; }
+  H4  { margin-left:  20px; }
+  H3  { margin-left:  10px; }
+-->
+</style>
+</head>
+
+<body>
+<div align="right"><small>
+&copy; Copyright 2017 Contributors.
+All rights reserved.
+</small></div>
+
+<h1>AspectJ 1.8.11 Readme</h1>
+
+<p>This release is a small compatibility release to improve the behaviour of the AspectJ 1.8
+line on JDK9. Importantly it includes a change that knows about the Java 9 version information
+and so does not get confused and think it is running on something really old (which typically
+manifests as it complaining about annotations not being supported on this level of Java).</p>
+
+<p>With that change this release is usable for Spring AOP use cases because that is doing
+runtime pointcut matching with proxy creation rather than actual weaving. Although if you
+using Spring AOP with class level annotation retention there may still be issues. If you
+experience problems or need to do actual weaving on JDK9, please use AspectJ9 instead.</p>
+
+<ul>
+<li>1.8.11 available 26-Sep-2017
+</ul>
+
+</body>
+</html>
diff --git a/docs/dist/doc/index.html b/docs/dist/doc/index.html
index b42262a1a..d600c82b7 100644
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@ -138,6 +138,7 @@
 <tr> <td>README's
      </td>
      <td>Changes and porting guide for AspectJ 
+        <a href="README-1811.html">1.8.10</a>,
         <a href="README-1810.html">1.8.10</a>,
         <a href="README-189.html">1.8.9</a>,
         <a href="README-188.html">1.8.8</a>,
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index f59300075..836cc9a1b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -4,7 +4,7 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.8.10
+compiler.name = AspectJ Compiler 1.8.11
 compiler.version = Eclipse Compiler Neon.2 #75dbfad0, 3.12
 compiler.copyright =