diff --git a/doc.md b/doc.md
index 97581ee9..931ab9ba 100644
--- a/doc.md
+++ b/doc.md
@@ -130,6 +130,7 @@ Core documentation for Qubes users.
  * [USB Troubleshooting](/doc/usb-troubleshooting/)
  * [GUI Troubleshooting](/doc/gui-troubleshooting/)
  * [Media Troubleshooting](/doc/media-troubleshooting/)
+ * [VPN Troubleshooting](/doc/vpn-troubleshooting/)
 
 ### Reference Pages
 
@@ -271,17 +272,6 @@ For more, please see [Qubes Community Documentation](https://github.com/Qubes-Co
  * [Language Localization](/doc/language-localization/)
  * [Dark Theme in Dom0 and DomU](/doc/dark-theme/)
  * [Safely Removing TemplateVM Packages (Example: Thunderbird)](/doc/removing-templatevm-packages/)
- 
- ### Troubleshooting
-
- * [Installing on system with new AMD GPU (missing firmware problem)](https://groups.google.com/group/qubes-devel/browse_thread/thread/e27a57b0eda62f76)
- * [How to install an Nvidia driver in dom0](/doc/install-nvidia-driver/)
- * [Nvidia troubleshooting guide](/doc/nvidia-troubleshooting/)
- * [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/)
- * [Intel Integrated Graphics Troubleshooting](/doc/intel-igfx-troubleshooting/)
-
 
 ### Troubleshooting
 
diff --git a/external/configuration-guides/vpn.md b/external/configuration-guides/vpn.md
index 1f843215..002a28f3 100644
--- a/external/configuration-guides/vpn.md
+++ b/external/configuration-guides/vpn.md
@@ -318,6 +318,4 @@ If you want to update your TemplateVMs through the VPN, you can enable the `qube
 Troubleshooting
 ---------------
 
-* Always test your basic VPN connection before adding scripts.
-* Test DNS: Ping a familiar domain name from an appVM. It should print the IP address for the domain.
-* Use `iptables -L -v` and `iptables -L -v -t nat` to check firewall rules. The latter shows the critical PR-QBS chain that enables DNS forwarding.
+See the [VPN Troubleshooting](/doc/vpn-troubleshooting/) guide for tips on how to fix common VPN issues. 
diff --git a/user/troubleshooting/vpn-troubleshooting.md b/user/troubleshooting/vpn-troubleshooting.md
new file mode 100644
index 00000000..5ea4cc12
--- /dev/null
+++ b/user/troubleshooting/vpn-troubleshooting.md
@@ -0,0 +1,28 @@
+---
+layout: doc
+title: VPN Troubleshooting
+permalink: /doc/vpn-troubleshooting/
+---
+
+# VPN Troubleshooting Guide #
+
+## Tips 
+
+* Check the VPN service's log in the VPN VM by running:
+    ~~~
+    sudo journalctl -u qubes-vpn-handler
+    ~~~
+* Always test your basic VPN connection before adding scripts. 
+
+* Test DNS: Ping a familiar domain name from an appVM. It should print the IP address for the domain.
+
+* Use `iptables -L -v` and `iptables -L -v -t nat` to check firewall rules. The latter shows the critical PR-QBS chain that enables DNS forwarding.
+
+## VPN does not reconnect after suspend 
+After suspend/resume, your VPN may not automatically reconnect. In order to get it to work, you must kill your VPN system and restart it. 
+
+## VPN stuck at "Ready to start link" 
+
+After setting up your VPN system and restarting the VM, you may be repeatedly getting the popup "Ready to start link", but the VPN isn't connected. 
+
+To figure out the root of the problem, check the VPN logs in `/var/logs/syslog`. The log may reveal issues like missing libraries, which you can then install.