diff --git a/release-announcement-template.txt b/release-announcement-template.txt
index e2df6df..f39f374 100644
--- a/release-announcement-template.txt
+++ b/release-announcement-template.txt
@@ -1,10 +1,10 @@
 Gerrit version {{ data.version }} is now available.{% if data.summary %} {{ data.summary }} {% endif %}Please see the release notes for details.
 
 Release Notes:
-https://www.gerritcodereview.com/{{ data.version.major }}.html{% if data.version.patch %}#{{ data.version.patch }}{% endif %}
+https://www.gerritcodereview.com/{{ data.version.major }}.html{% if data.version.anchor %}#{{ data.version.anchor }}{% endif %}
 
 Documentation:
-http://gerrit-documentation.storage.googleapis.com/Documentation/{{ data.version }}/index.html
+http://gerrit-documentation.storage.googleapis.com/Documentation/{{ data.version.version_no_rc }}/index.html
 {% if data.previous %}
 Log of changes since {{ data.previous }}:
 https://gerrit.googlesource.com/gerrit/+log/v{{ data.previous }}..v{{ data.version }}?no-merges
diff --git a/release-announcement.py b/release-announcement.py
index 688de42..c27e218 100755
--- a/release-announcement.py
+++ b/release-announcement.py
@@ -70,13 +70,14 @@
 class Version:
     def __init__(self, version):
         self.version = version
+        self.version_no_rc = version.split("-")[0]
         parts = version.split(".")
         if len(parts) > 2:
             self.major = ".".join(parts[:2])
-            self.patch = version.replace(".", "")
+            self.anchor = self.version_no_rc.replace(".", "")
         else:
             self.major = version
-            self.patch = None
+            self.anchor = None
 
     def __str__(self):
         return self.version