diff --git a/troubleshooting/nvidia-troubleshooting.md b/troubleshooting/nvidia-troubleshooting.md
index deb2ea98..af864941 100644
--- a/troubleshooting/nvidia-troubleshooting.md
+++ b/troubleshooting/nvidia-troubleshooting.md
@@ -13,10 +13,17 @@ NVidia Troubleshooting Guide
 
 If you have an NVidia graphics card it will probably not work under Xen out of the box. If your system freezes during boot and you don't see the graphical login manager after you installed Xen, then this problem most likely affects you. The following steps should provide a work around so that you should be able to use your NVidia with X under Xen, however without any fancy "desktop effects".
 
+Boot in failsafe
+---------------------
+
 1.  Boot your system using the "failsafe" boot menu, that should have been automatically added to your `grub.conf` when you installed the Dom0 kernel.
 
 If the X Window System doesn't start now, this is probably a non-Xen related issue and this guide will probably not help you.
 
+
+Configure X with nouveau
+---------------------
+
 Assuming your X Window System works fine now when you booted from the "failsafe" configuration, do the next steps...
 
 1.  Do not log into X, but instead switch to a text console (press Ctrl-Alt-F2)
@@ -71,3 +78,72 @@ If you see a terminal window in the top left corner, it means you most likely su
 
 1.  Reboot and let the system boot from the normal boot configuration. You should be able to use X under Xen now.
 
+
+Disabling Nouveau
+---------------------
+If Qubes fails to properly boot after the GRUB Boot menu and you get a black screen that displays messages starting with `nouveau` then it means that the nouveau driver failed to launch properly.
+
+One way to get rid of this for now is to disable nouveau.
+
+Example error
+~~~
+nouveau E[ PGRAPH][0000:01:00.0] grctx template channel unload timeout
+nouveau E[ PGRAPH][0000:01:00.0] failed to construct context
+nouveau E[ PGRAPH][0000:01:00.0] init failed, -16
+~~~
+
+Tip: In the case that you only have an external monitor it is advised to hook it up to the connector directly connected to the motherboard if it is present, this should bypass the nvidia graphics card.
+
+If you're seeing this error than that means another graphics card (most likely an integrated one) acted as failsafe. Disabling nouveau has the consequences of disabling nvidia support all together. 
+
+1. Verify that that GRUB Boot Menu is displaying, you should be presented with two options and a progressbar/timer than goes rather fast.
+~~~
+Qubes
+Qubes with advanced Xen options
+~~~
+
+2. Quickly press the "E" key before the time is up.
+
+3. An editor will open up that will allow you to temporarily change the grub options for the next boot.
+
+4. Press the down arrow key and move the cursor to the line after the line with the kernel options. The line with the kernel options might look something like, I didn't type everything as it may differ from system to system but it should look something like this:
+
+~~~
+module /vmlinux-4.1.13-9.pvops.qubes.x86_64 placeholder root=/dev/mapper/qubes_dom0-root ro ... rhgb quiet
+~~~
+
+Please note: chose the module that starts with `vmlinux`!
+
+5. Press the left/right arrow keys to position the cursor at the end of kernel options line, after `rhgb quiet` in this case.
+
+6.  Add the following:
+~~~
+nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off
+~~~
+This will tempororarily disable nouveau until boot.
+
+7. Press either the F10 key or Ctrl+X to start the boot process.
+
+Qubes should now boot properly, if that's the case then we should make this change permanent such that the GRUB config knows to not run nouveau.
+
+To make this change persistent, so your boot will always work properly you'll have to do the following
+
+1. Open a terminal (do this vb clicking on Q > 'run command' > type 'terminal' and hit enter)
+
+2. type following commands:
+~~~
+cd /etc/default/
+sudo nano grub
+~~~
+
+3. Edit `GRUB_CMDLINE_LINUX`, add the following to it at the end:
+~~~
+nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off
+~~~
+
+4. ctrl + X and then y to save the file.
+
+5. The final step is to compile the configuration file to something the bootloader can read.
+~~~
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+~~~