diff --git a/doc.md b/doc.md
index d95aa586..97581ee9 100644
--- a/doc.md
+++ b/doc.md
@@ -129,6 +129,7 @@ Core documentation for Qubes users.
  * [PCI Troubleshooting](/doc/pci-troubleshooting/)
  * [USB Troubleshooting](/doc/usb-troubleshooting/)
  * [GUI Troubleshooting](/doc/gui-troubleshooting/)
+ * [Media Troubleshooting](/doc/media-troubleshooting/)
 
 ### Reference Pages
 
@@ -270,6 +271,17 @@ 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/user/troubleshooting/media-troubleshooting.md b/user/troubleshooting/media-troubleshooting.md
new file mode 100644
index 00000000..d07a5c5b
--- /dev/null
+++ b/user/troubleshooting/media-troubleshooting.md
@@ -0,0 +1,24 @@
+---
+layout: doc
+title: Media Troubleshooting
+permalink: /doc/media-troubleshooting/
+---
+# Video and Audio Troubleshooting #
+
+## Can't play media videos in a VM due to missing codecs
+
+If you’re having trouble playing a video file in a qube, you’re probably missing the required codecs. 
+The easiest way to resolve this is to install VLC Media Player and use that to play your video files. 
+You can do this in multiple different TemplateVM distros by following the instructions [here](/faq/#how-do-i-play-video-files).
+
+## Video lagging
+
+Playing videos may cause lags since software decoding uses a lot of CPU. 
+
+Depending on your video player, there are some settings that may smoothen video plays:
+* If using VLC media player, go to Tools--> Preferences --> Video --> Output. 
+By default, the Output is set to "Automatic".  
+Go through the list and try out other output options to see if any makes videos run smoother. 
+* If using mpv media player, you may be able to improve performance by entering `mpv --profile=sw-fast --vo=x11` in a terminal. 
+* For video lags when playing videos from a browser, disable hardware acceleration in the browser. If the problem arises when watching streams, it may be smoother to use `streamlink` to view streams in mpv instead of using the browser.
+