diff --git a/about/mailing-lists.md b/about/mailing-lists.md
index a6b6dee6..063d10fc 100644
--- a/about/mailing-lists.md
+++ b/about/mailing-lists.md
@@ -369,7 +369,7 @@ You must be subscribed in order to post to this list.
 [HCL]: /doc/hcl/
 [Installation Guide]: /doc/installation-guide/
 [System Requirements]: /doc/system-requirements/
-[User FAQ]: /doc/user-faq/
+[User FAQ]: /faq/#users
 [documentation]: /doc/
 [thunderbird-newsgroup]: https://support.mozilla.org/en-US/kb/creating-newsgroup-account
 [qubes-users-web]: https://groups.google.com/group/qubes-users
diff --git a/basics_user/intro.md b/basics_user/intro.md
index 71e2dc8d..ade01e72 100644
--- a/basics_user/intro.md
+++ b/basics_user/intro.md
@@ -228,9 +228,9 @@ technical details have been omitted here for the sake of presentation.
 [Xen]: https://www.xenproject.org
 [paper-compart]: https://invisiblethingslab.com/resources/2014/Software_compartmentalization_vs_physical_separation.pdf
 [doc]: /doc/
-[user-faq]: /doc/user-faq/
+[user-faq]: /faq/#users
 [system-doc]: /doc/system-doc/
-[devel-faq]: /doc/devel-faq/
+[devel-faq]: /faq/#developers
 [downloads]: /downloads/
 [getting started]: /getting-started/
 
diff --git a/common-tasks/usb.md b/common-tasks/usb.md
index d03e699b..8ac8e410 100644
--- a/common-tasks/usb.md
+++ b/common-tasks/usb.md
@@ -383,7 +383,7 @@ This feature is not yet available in Qubes Manager however, if you would like to
 [2270-comm23]: https://github.com/QubesOS/qubes-issues/issues/2270#issuecomment-242900312
 [1082]: https://github.com/QubesOS/qubes-issues/issues/1082
 [hide-usb]: #how-to-hide-all-usb-controllers-from-dom0
-[faq-usbvm]: /doc/user-faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot
+[faq-usbvm]: /faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot
 [AEM]: /doc/anti-evil-maid/
 [1618]: https://github.com/QubesOS/qubes-issues/issues/1618
 [create a USB qube]: #creating-and-using-a-usb-qube
diff --git a/doc.md b/doc.md
index 2f161a0a..e1d67117 100644
--- a/doc.md
+++ b/doc.md
@@ -23,13 +23,14 @@ The Basics
  * [Video Tours](/video-tours/)
  * [Screenshots](/screenshots/)
  * [Getting Started](/getting-started/)
- * [User FAQ](/doc/user-faq/)
+ * [User FAQ](/faq/#users)
  * [Mailing Lists](/mailing-lists/)
  * [How to Contribute](/doc/contributing/)
 
 Security Information
 --------------------
  * [Security Center](/security/)
+ * [Security FAQ] (/faq/#general-security)
  * [Security Pack](/security/pack/)
  * [Security Bulletins](/security/bulletins/)
  * [Canaries](/security/canaries/)
@@ -203,7 +204,7 @@ Developer Documentation
 
 The Basics
 ----------
- * [Developer FAQ](/doc/devel-faq/)
+ * [Developer FAQ](/faq/#developers)
  * [Report a Security Issue](/security/)
  * [Report a Bug](/doc/reporting-bugs/)
  * [How to Contribute](/doc/contributing/)
@@ -222,6 +223,7 @@ The Basics
 Security Information
 --------------------
  * [Security Center](/security/)
+ * [Security FAQ] (/faq/#general-security)
  * [Security Pack](/security/pack/)
  * [Security Bulletins](/security/bulletins/)
  * [Security Bulletin Checklist](/security/bulletins/checklist/)
diff --git a/installing/upgrade/upgrade-to-r3.1.md b/installing/upgrade/upgrade-to-r3.1.md
index b69852f8..e858c6b7 100644
--- a/installing/upgrade/upgrade-to-r3.1.md
+++ b/installing/upgrade/upgrade-to-r3.1.md
@@ -107,7 +107,7 @@ Maid passphrase to the new configuration. Please consult the Anti Evil Maid
 
 If you use USB VM, you may encounter problem with starting it on updated Xen
 version (because of strict default settings). Take a look at 
-[User FAQ](/doc/user-faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot)
+[User FAQ](/faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot)
 for details.
 
 Once you have upgraded dom0, you can install new templates from Qubes R3.1
diff --git a/security/security-guidelines.md b/security/security-guidelines.md
index 1bfa6551..125ba46b 100644
--- a/security/security-guidelines.md
+++ b/security/security-guidelines.md
@@ -129,7 +129,7 @@ It is preferable to avoid using **Bluetooth** if you travel or do not trust your
 
 Many laptops allow one to disable various hardware (Camera, BT, Mic, etc) **in BIOS**. This might or might not be a dependable way of getting rid of those devices, depending on how much you trust your BIOS vendor.
 
-If the VM will not start after you have assigned a USB controller, look at [this faq](../user-faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot).
+If the VM will not start after you have assigned a USB controller, look at [this FAQ](/faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot).
 
 
 Creating and Using a USBVM