diff --git a/docs/frequently-asked-questions.rst b/docs/frequently-asked-questions.rst
index 3b14446..c0cbc0d 100644
--- a/docs/frequently-asked-questions.rst
+++ b/docs/frequently-asked-questions.rst
@@ -84,5 +84,5 @@
 infrastructure and can be safely ignored. Those who are curious can see the
 documentation for `this Jenkins plugin`_ for more details.
 
-.. _release information: release-information
+.. _release information: release-information.rst
 .. _this Jenkins plugin: https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin
diff --git a/docs/psci-performance-juno.rst b/docs/psci-performance-juno.rst
index a28f732..621c8bf 100644
--- a/docs/psci-performance-juno.rst
+++ b/docs/psci-performance-juno.rst
@@ -282,4 +282,4 @@
 effects, given that these measurements are at the nano-second level.
 
 .. _Juno R1 platform: https://www.arm.com/files/pdf/Juno_r1_ARM_Dev_datasheet.pdf
-.. _TF master as of 31/01/2017: https://github.com/ARM-software/arm-trusted-firmware/tree/c38b36d
+.. _TF master as of 31/01/2017: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/?id=c38b36d
diff --git a/docs/release-information.rst b/docs/release-information.rst
index af3cbbe..5531150 100644
--- a/docs/release-information.rst
+++ b/docs/release-information.rst
@@ -81,9 +81,9 @@
 | Makefile in ``INCLUDES``.      |             |         | header files. More information in commit 09d40e0e0828_. |
 +--------------------------------+-------------+---------+---------------------------------------------------------+
 
-*Copyright (c) 2018, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2018-2019, Arm Limited and Contributors. All rights reserved.*
 
-.. _Platform compatibility policy: https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/platform-compatibility-policy.rst
-.. _crash_console_helpers.S: https://github.com/ARM-software/arm-trusted-firmware/blob/master/plat/common/aarch64/crash_console_helpers.S
-.. _cc5859c: https://github.com/ARM-software/arm-trusted-firmware/commit/cc5859ca19ff546c35eb0331000dae090b6eabcf
-.. _09d40e0e0828: https://github.com/ARM-software/arm-trusted-firmware/commit/09d40e0e08283a249e7dce0e106c07c5141f9b7e
+.. _Platform compatibility policy: platform-compatibility-policy.rst
+.. _crash_console_helpers.S: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/plat/common/aarch64/crash_console_helpers.S
+.. _cc5859c: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=cc5859ca19ff546c35eb0331000dae090b6eabcf
+.. _09d40e0e0828: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=09d40e0e08283a249e7dce0e106c07c5141f9b7e
diff --git a/docs/security-center.rst b/docs/security-center.rst
index 825b110..1c82f29 100644
--- a/docs/security-center.rst
+++ b/docs/security-center.rst
@@ -89,12 +89,12 @@
 +-----------+------------------------------------------------------------------+
 
 .. _GitHub issue tracker: https://github.com/ARM-software/tf-issues/issues
-.. _this PGP/GPG key: Trusted-Firmware-Security.asc
-.. _TFV-1: ARM-Trusted-Firmware-Security-Advisory-TFV-1
-.. _TFV-2: ARM-Trusted-Firmware-Security-Advisory-TFV-2
-.. _TFV-3: ARM-Trusted-Firmware-Security-Advisory-TFV-3
-.. _TFV-4: ARM-Trusted-Firmware-Security-Advisory-TFV-4
-.. _TFV-5: ARM-Trusted-Firmware-Security-Advisory-TFV-5
-.. _TFV-6: Arm-Trusted-Firmware-Security-Advisory-TFV-6
-.. _TFV-7: Trusted-Firmware-A-Security-Advisory-TFV-7
-.. _TFV-8: Trusted-Firmware-A-Security-Advisory-TFV-8
+.. _this PGP/GPG key: security-reporting.asc
+.. _TFV-1: ./security_advisories/security-advisory-tfv-1.rst
+.. _TFV-2: ./security_advisories/security-advisory-tfv-2.rst
+.. _TFV-3: ./security_advisories/security-advisory-tfv-3.rst
+.. _TFV-4: ./security_advisories/security-advisory-tfv-4.rst
+.. _TFV-5: ./security_advisories/security-advisory-tfv-5.rst
+.. _TFV-6: ./security_advisories/security-advisory-tfv-6.rst
+.. _TFV-7: ./security_advisories/security-advisory-tfv-7.rst
+.. _TFV-8: ./security_advisories/security-advisory-tfv-8.rst