diff --git a/Templates/Debian.md b/Templates/Debian.md
index 818f2a92..66689dd4 100644
--- a/Templates/Debian.md
+++ b/Templates/Debian.md
@@ -5,19 +5,25 @@ permalink: /doc/Templates/Debian/
 redirect_from: /wiki/Templates/Debian/
 ---
 
-Debian template
+Debian template(s)
 ===============
 
-Debian template is one of the templates made by Qubes community. It should be considered experimental as Qubes developers team use mainly Fedora-based VMs to test new features/updates.
+Debian template(s) are one of the templates made by Qubes community. It should be considered experimental as Qubes developers team use mainly Fedora-based VMs to test new features/updates.
 
 Install
 -------
 
 It can be installed via the following command:
 
-{% highlight trac-wiki %}
-[user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-8
-{% endhighlight %}
+Debian 7 (wheezy) - stable:
+
+    [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-7
+
+Debian 8 (jessie) - testing:
+
+    [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-8
+
+When installing on R2, add "-x64" suffix to the package name.
 
 Known issues
 ------------
diff --git a/UserDoc.md b/UserDoc.md
index 19178d97..3530f4d9 100644
--- a/UserDoc.md
+++ b/UserDoc.md
@@ -47,7 +47,7 @@ Qubes User Documentation
             3.  [​How to make proxy for individual tcp connection from networkless VM](https://groups.google.com/group/qubes-devel/msg/4ca950ab6d7cd11a)
             4.  [​HTTP filtering proxy in Qubes firewall VM](https://groups.google.com/group/qubes-devel/browse_thread/thread/5252bc3f6ed4b43e/d881deb5afaa2a6c#39c95d63fccca12b)
 
-    5.  **TemplateVMs**
+    5.  **[TemplateVMs](/doc/Templates/)**
         1.  [Updating and Installing Software in VMs](/wiki/SoftwareUpdateVM/)
         2.  [Templates: Fedora - minimal](/wiki/Templates/FedoraMinimal/)
         3.  [Templates: Debian](/wiki/Templates/Debian/)