Merge branch 'master' into asf-site
# Conflicts:
# content/downloads/downloads.html
diff --git a/content/downloads/downloads.html b/content/downloads/downloads.html
index 0eae9fc..5c9398b 100644
--- a/content/downloads/downloads.html
+++ b/content/downloads/downloads.html
@@ -87,7 +87,7 @@
<p><h2>Apache Roller Releases</h2>
<p>Releases of the Apache Roller blog server are made available to the general public at no charge, under the <a href="http://apache.org/licenses/">Apache License,</a> in both binary and source distributions.</p>
<h3>General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em></h3>
-<p><strong><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-6/v6.0.0/">Roller 6.0.0</a> ("best available")</strong></p>
+<p><strong><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-6.0/v6.0.0/">Roller 6.0.0</a> ("best available")</strong></p>
<p>Previous source and binary distributions, including documentation, are available in the <a class="external" href="http://archive.apache.org/dist/roller/">Apache archives</a>.</p>
<p>Project releases are approved by vote of the Apache Roller Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/ROL">issue tracker</a>. The user mailing list and issue tracker are the <strong>only</strong> support options hosted by the Apache Roller project.</p>
<p>Note: When downloading from a mirror, be sure to verify that checksums and/or signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a class="external" href="http://www.apache.org/dist/roller/"><a href="http://www.apache.org/dist/roller/">http://www.apache.org/dist/roller/</a></a>.</p>
diff --git a/sources/src/main/jbake/content/downloads/downloads.md b/sources/src/main/jbake/content/downloads/downloads.md
index 76283f3..d986260 100644
--- a/sources/src/main/jbake/content/downloads/downloads.md
+++ b/sources/src/main/jbake/content/downloads/downloads.md
@@ -8,7 +8,7 @@
Releases of the Apache Roller blog server are made available to the general public at no charge, under the <a href="http://apache.org/licenses/">Apache License,</a> in both binary and source distributions.
### General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em>
-__<a href="http://www.apache.org/dyn/closer.cgi/roller/roller-6/v6.0.0/">Roller 6.0.0</a> ("best available")__
+__<a href="http://www.apache.org/dyn/closer.cgi/roller/roller-6.0/v6.0.0/">Roller 6.0.0</a> ("best available")__
Previous source and binary distributions, including documentation, are available in the <a class="external" href="http://archive.apache.org/dist/roller/">Apache archives</a>.
