diff --git a/source/posts/2019-05-21-official-stance-on-java.html.markdown.erb b/source/posts/2019-05-21-official-stance-on-java.html.markdown.erb
index 0bb1d28521..b9688055d4 100644
--- a/source/posts/2019-05-21-official-stance-on-java.html.markdown.erb
+++ b/source/posts/2019-05-21-official-stance-on-java.html.markdown.erb
@@ -27,11 +27,11 @@ For more information about this, take a look at:
 - [https://www.oracle.com/technetwork/java/javase/overview/oracle-jdk-faqs.html](https://www.oracle.com/technetwork/java/javase/overview/oracle-jdk-faqs.html)
 - [https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244](https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244)
 - [https://blog.joda.org/2018/09/do-not-fall-into-oracles-java-11-trap.html](https://blog.joda.org/2018/09/do-not-fall-into-oracles-java-11-trap.html)
-- [https://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html](https://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html)
+- [https://mail.openjdk.org/pipermail/discuss/2017-September/004281.html](https://mail.openjdk.org/pipermail/discuss/2017-September/004281.html)
 
 ## What are the options available?
 
-As an alternative to purchasing commercial support from Oracle, organisations may want to consider [OpenJDK](https://openjdk.java.net/), the free, open-source implementation of Java SE. The OpenJDK project will follow Oracle’s 6 month release cadence for Java, and will publish patches and security updates. There are commercially supported and open-source distributions of OpenJDK that GoCD users may possibly use:
+As an alternative to purchasing commercial support from Oracle, organisations may want to consider [OpenJDK](https://openjdk.org/), the free, open-source implementation of Java SE. The OpenJDK project will follow Oracle’s 6 month release cadence for Java, and will publish patches and security updates. There are commercially supported and open-source distributions of OpenJDK that GoCD users may possibly use:
 
 - [Zulu](https://www.azul.com/downloads/zulu/) from Azul Systems
 - [Corretto](https://aws.amazon.com/corretto/) from Amazon
@@ -42,7 +42,7 @@ A comparison of the different JDK offerings, by Azul (creators of Zulu JDK) is [
 
 ## What does this mean for users of GoCD?
 
-GoCD bundles the OpenJDK JRE in certain cases: Docker images, Windows installers and Mac OSX installers. We want to ensure that what we ship does not cause infringement issues for organizations using GoCD. Based on conversations with our legal counsel, we believe that it is safe to bundle OpenJDK with GoCD, since it is licensed under [GPLv2+CPE (GNU General Public License, version 2, with the Classpath Exception)](https://openjdk.java.net/legal/gplv2+ce.html), and is free even for commercial uses.
+GoCD bundles the OpenJDK JRE in certain cases: Docker images, Windows installers and Mac OSX installers. We want to ensure that what we ship does not cause infringement issues for organizations using GoCD. Based on conversations with our legal counsel, we believe that it is safe to bundle OpenJDK with GoCD, since it is licensed under [GPLv2+CPE (GNU General Public License, version 2, with the Classpath Exception)](https://openjdk.org/legal/gplv2+ce.html), and is free even for commercial uses.
 
 Given the 6-month release cycle, the effort required to maintain compatibility and test GoCD on several versions of Java can quickly become overwhelming. We also realize that due to operational and regulatory concerns, it *may* be infeasible to update Java versions every 6 months in production environments. So, GoCD will will support the **last 3 versions** of Java. This translates to support for Java versions roughly 18 months older than the current version. We recommend that users stay on the latest version of Java to ensure that they receive security updates or use a JRE from a vendor who backports security fixes and provides updates.