diff --git a/doc.md b/doc.md
index df16c6ed..ce3d6589 100644
--- a/doc.md
+++ b/doc.md
@@ -135,13 +135,18 @@ Core documentation for Qubes users.
  * [Making Any File Persistent Using `bind-dirs`](/doc/bind-dirs/)
  * [GUI Configuration](/doc/gui-configuration/)
  * [Resizing Disk Images](/doc/resize-disk-image/)
- * [Troubleshooting UEFI](/doc/uefi-troubleshooting/)
  * [Troubleshooting Newer Hardware](/doc/newer-hardware-troubleshooting/)
  * [Mounting and Decrypting Qubes Partitions from Outside Qubes](/doc/mount-from-other-os/)
  * [KDE](/doc/kde/)
  * [i3 Window Manager](/doc/i3/)
  * [awesome Window Manager](/doc/awesome/)
 
+### Troubleshooting
+
+ * [Installation Troubleshooting](/doc/installation-troubleshooting/)
+ * [UEFI Troubleshooting](/doc/uefi-troubleshooting/)
+ * [Suspend/Resume Troubleshooting](/doc/suspend-resume-troubleshooting/)
+
 ### Reference Pages
 
  * [Command-line Tools](/doc/tools/)
@@ -294,7 +299,6 @@ Unofficial, third-party documentation from the Qubes community and others.
  * [Lenovo ThinkPad Troubleshooting](/doc/thinkpad-troubleshooting/)
  * [Apple MacBook Troubleshooting](/doc/macbook-troubleshooting/)
  * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/)
- * [Fixing wireless on suspend & resume](/doc/wireless-troubleshooting/)
  * [How to remove VMs manually](/doc/remove-vm-manually/)
  * [Intel Integrated Graphics Troubleshooting](/doc/intel-igfx-troubleshooting/)
 
diff --git a/external/troubleshooting/wireless-troubleshooting.md b/user/troubleshooting/resume-suspend-troubleshooting.md
similarity index 83%
rename from external/troubleshooting/wireless-troubleshooting.md
rename to user/troubleshooting/resume-suspend-troubleshooting.md
index 9c8ea33d..124465d3 100644
--- a/external/troubleshooting/wireless-troubleshooting.md
+++ b/user/troubleshooting/resume-suspend-troubleshooting.md
@@ -1,19 +1,18 @@
 ---
 layout: doc
-title: Wireless Troubleshooting
-permalink: /doc/wireless-troubleshooting/
+title: Suspend/Resume Troubleshooting
+permalink: /doc/suspend-resume-troubleshooting/
 redirect_from:
 - /en/doc/wireless-troubleshooting/
+- /doc/wireless-troubleshooting/
 ---
 
-Wireless Troubleshooting Guide
-==============================
+# Troubleshooting problems relating to suspend/resume #
+
+## Network-Manager says “Device not ready” after suspend/resume ##
 
 These instructions may help with suspend/resume issues for more devices than just wireless cards, that is just the (unfortunately not uncommon) example used here.
 
-Resetting wireless cards by reloading drivers
----------------------------------------------
-
 If your wireless card works, but after suspending and resuming your computer, the Network-Manager applet just says "Device not ready", then try un-loading and re-loading the driver.
 
 ### Determining your wireless card driver ###
@@ -104,8 +103,7 @@ depends:        cfg80211
 [user@sys-net ~]$ sudo modprobe iwlmvm
 ~~~
 
-Automatically reloading drivers on suspend/resume
--------------------------------------------------
+## Drivers do not reload automatically on suspend/resume ##
 
 If reloading the driver (which resets the hardware into a known-state) resolves your issue when done manually, you can have Qubes automatically un/reload them on suspend & resume by listing the relevant modules in `/rw/config/suspend-module-blacklist`.
 
@@ -119,3 +117,9 @@ In the above example, it would look like this:
 iwlmvm
 iwlwifi
 ~~~
+
+## Power consumption increases after suspend/resume ##
+
+This problem is related to the software method used to disable sibling threads and how it interacts with suspend/resume. 
+To solve the problem, disable hyperthreading in the BIOS. This [external guide](https://www.pcmag.com/news/how-to-disable-hyperthreading) explains how to disable hyperthreading. 
+Since Qubes does disable hyperthreading by default (by not using secondary threads), you won't pay any performance cost.