diff --git a/QubesDocs.md b/QubesDocs.md
index d0787807..4b274642 100644
--- a/QubesDocs.md
+++ b/QubesDocs.md
@@ -20,6 +20,7 @@ For Users
 -   [On Digital Signatures and How to Verify Qubes Downloads](/wiki/VerifyingSignatures/)
 -   [Installation Guides](/wiki/QubesDownloads/)
 -   [Troubleshooting](/wiki/TroubleShooting/)
+-   [Security](/wiki/QubesSecurity/)
 
 For Developers
 --------------
@@ -31,4 +32,6 @@ For Developers
 -   [Coding Guidelines](/wiki/CodingStyle/)
 -   [Books for Developers](/wiki/DevelBooks/)
 -   [Research Papers](/wiki/QubesResearch/)
+-   [Architecture](/wiki/QubesArchitecture/)
+-   [Licensing](/wiki/QubesLicensing/)
 
diff --git a/QubesDownloads.md b/QubesDownloads.md
index d26f5269..77f41a4a 100644
--- a/QubesDownloads.md
+++ b/QubesDownloads.md
@@ -11,6 +11,7 @@ Qubes Downloads
 -   [System Requirements](/wiki/SystemRequirements)
 -   [Hardware Compatibility List](/wiki/HCL)
 -   [On Digital Signatures and How to Verify Qubes Downloads](/wiki/VerifyingSignatures)
+-   [Licensing](/wiki/QubesLicensing)
 
 Qubes Release 2
 ---------------
diff --git a/WikiStart.md b/WikiStart.md
index 6c4caf69..64e17615 100644
--- a/WikiStart.md
+++ b/WikiStart.md
@@ -20,7 +20,7 @@ Qubes is an open-source operating system designed to provide strong security for
 -   [​Qubes OS Tutorial slides by ITL](http://www.invisiblethingslab.com/resources/2014/LinuxCon_2014_Qubes_Tutorial.pdf) (LinuxCon October 2014)
 -   [Screenshots](/wiki/QubesScreenshots)
 -   [Architecture Overview](/wiki/QubesArchitecture), and also the more recent: [​Why Qubes OS is more than a bunch of VMs?](http://www.invisiblethingslab.com/resources/2014/Software_compartmentalization_vs_physical_separation.pdf)
--   [Qubes Security Goals](/wiki/SecurityGoals)
+-   [Security](/wiki/QubesSecurity)
 -   [FAQ](/wiki/UserFaq)
 -   [User Documentation](/wiki/UserDoc)
 -   [​How is Qubes OS different from...?](http://theinvisiblethings.blogspot.com/2012/09/how-is-qubes-os-different-from.html)