diff --git a/README.md b/README.md
index 9f0a0bbb4..3b3b06042 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,10 @@ Ensure you run this with a JDK - the more recent the better since some tests wil
 
 ## Documentation for AspectJ users
 
-* [Complete documentation quicklinks](https://www.eclipse.org/aspectj/docs.php)
+* [Complete documentation quicklinks](docs/index.adoc)
 * [Setting up a development environment](docs/developer/IDE.md)
-* [Getting started with AspectJ](https://www.eclipse.org/aspectj/doc/released/progguide/starting.html)
-* [Programming Guide](https://www.eclipse.org/aspectj/doc/released/progguide/index.html)
+* [Getting started with AspectJ](docs/progguide/gettingstarted.adoc)
+* [Programming Guide](docs/progguide/index.adoc)
 * [READMEs for each version of AspectJ](docs/release)
 * [AspectJ Java version compatibility](docs/release/JavaVersionCompatibility.adoc)
 
diff --git a/docs/release/README-1.5.0.adoc b/docs/release/README-1.5.0.adoc
index d6bd837f0..1f4e377ed 100644
--- a/docs/release/README-1.5.0.adoc
+++ b/docs/release/README-1.5.0.adoc
@@ -13,7 +13,7 @@ AspectJ 5].
 Some of the other documentation has not been updated for AspectJ 5. For
 the latest documentation, see
 https://eclipse.org/aspectj/doc/next/index.html, linked off
-https://eclipse.org/aspectj/docs.php[the AspectJ documentation home page].
+https://eclipse.org/aspectj/doc/latest/index.html[the AspectJ documentation home page].
 
 For information on bug fixes in AspectJ 5 v1.5.0, see the
 xref:changes.adoc[changes] document.
diff --git a/docs/release/README-1.5.3.adoc b/docs/release/README-1.5.3.adoc
index 280181aeb..b5f019878 100644
--- a/docs/release/README-1.5.3.adoc
+++ b/docs/release/README-1.5.3.adoc
@@ -82,8 +82,7 @@ problems - the usage scenarios for AJ are becoming more and more
 sophisticated. To help us work on problems in these scenarios we have
 added a tracing and logging framework and improved our dump mechanism.
 These traces and dumps can be attached to bug reports. In AspectJ 1.5.3
-we have included some
-https://www.eclipse.org/aspectj/doc/released/pdguide/index.html[documentation]
+we have included some xref:../pdguide/index.adoc[documentation]
 on how to configure these new features. Don't be surprised if you get
 asked for an AspectJ trace on a future bug report!
 
diff --git a/docs/release/README-1.6.4.adoc b/docs/release/README-1.6.4.adoc
index e3d2550df..8529d9985 100644
--- a/docs/release/README-1.6.4.adoc
+++ b/docs/release/README-1.6.4.adoc
@@ -197,8 +197,7 @@ public static SomeInterface createDelegate(Object instance) {
 }
 ....
 
-More examples are
-https://www.eclipse.org/aspectj/doc/released/adk15notebook/ataspectj-itds.html[here
+More examples are xref:../adk15notebook/ataspectj.adoc#ataspectj-itds[here
 in the online documentation].
 
 Going forward attempts will be made to try and make @DeclareParents
diff --git a/docs/release/README-1.8.4.adoc b/docs/release/README-1.8.4.adoc
index b70d97240..48dea03a6 100644
--- a/docs/release/README-1.8.4.adoc
+++ b/docs/release/README-1.8.4.adoc
@@ -12,18 +12,17 @@ _Release info: 1.8.4 available 6-Nov-2014_
 === Support for is(FinalType)
 
 AspectJ has had type category type patterns since version 1.6.9, see the
-https://www.eclipse.org/aspectj/doc/released/README-1.6.9.html[README].
-This enabled pointcuts to include is(..) clauses to specify which kinds
-of type they were or were not interested in matching, e.g. !within(* &&
-is(InnerType)) means not within innertypes. In 1.8.4 it is now possible
+xref:README-1.6.9.adoc[read-me].
+This enabled pointcuts to include `is(..)` clauses to specify which kinds
+of type they were or were not interested in matching, e.g. `!within(* &&
+is(InnerType))` means not within innertypes. In 1.8.4 it is now possible
 to recognize (for inclusion or exclusion) final types with
-is(FinalType).
+`is(FinalType)`.
 
-=== thisAspectInstance correctly handled with -1.8
+=== `thisAspectInstance` correctly handled with `-1.8`
 
 This is the key fix in this release. Some products based on AspectJ were
-using the thisAspectInstance feature (see
-https://www.eclipse.org/aspectj/doc/released/README-1.6.12.html[README
-1.6.12] for more info on the feature). Unfortunately if specifying -1.8
+using the `thisAspectInstance` feature (see xref:README-1.6.12.adoc[read-me 1.6.12]
+for more info on the feature). Unfortunately if specifying `-1.8`
 compliance and using the feature an error would be reported at compile
 time of the aspect. This is now fixed.