diff --git a/Templates/Archlinux.md b/Templates/Archlinux.md
index 5db9db41..03db31b4 100644
--- a/Templates/Archlinux.md
+++ b/Templates/Archlinux.md
@@ -27,7 +27,11 @@ Install
 Currently we do not ship ready to use binary package. It can be compiled using
 [this instructions](/doc/BuildingArchlinuxTemplate/).
 
-Olivier provides binary package build by himself, you can get it [here](https://groups.google.com/d/msgid/qubes-devel/54CE3FB1.3050708%40yahoo.fr).
+Olivier provides binary package build by himself, you can get it for:
+* Qubes R2 [here](https://groups.google.com/d/msgid/qubes-devel/54CE3FB1.3050708%40yahoo.fr).
+* Qubes R3 [here](https://groups.google.com/d/msg/qubes-users/RI3KQVEEc30/h5nsNw_SHTQJ)
+
+
 
 Known issues
 ------------
diff --git a/Templates/Ubuntu.md b/Templates/Ubuntu.md
index 3d7f635b..45de1d69 100644
--- a/Templates/Ubuntu.md
+++ b/Templates/Ubuntu.md
@@ -10,7 +10,10 @@ Ubuntu template(s)
 
 If you like to use Ubuntu Linux distribution in your AppVMs, you can build and
 install one of available Ubuntu templates. Those template currently are not
-available in ready to use binary packages.
+available in ready to use binary packages, because Canonical does not allow
+to redistribute a modified Ubuntu. The redistribution is not allowed by their
+[Intellectual property rights policy](http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy).
+
 
 Install
 -------
@@ -26,4 +29,5 @@ want to build.
 Known issues
 ------------
 
-If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto).
+If you want to help in improving the template, feel free to
+[contribute](/wiki/ContributingHowto).
diff --git a/UserDoc.md b/UserDoc.md
index bed52081..edcdeda1 100644
--- a/UserDoc.md
+++ b/UserDoc.md
@@ -57,8 +57,10 @@ Qubes User Documentation
         3.  [Upgrading the Fedora 20 Template](/doc/FedoraTemplateUpgrade20/)
         4.  [Templates: Fedora - minimal](/doc/Templates/FedoraMinimal/)
         5.  [Templates: Debian](/doc/Templates/Debian/)
-        6.  [Extending \`root.img\` Size](/doc/ResizeRootDiskImage/)
-        
+        6.  [Templates: Archlinux](/doc/Templates/Archlinux/)
+        7.  [Templates: Ubuntu](/doc/Templates/Ubuntu/)
+        8.  [Extending \`root.img\` Size](/doc/ResizeRootDiskImage/)
+
     6.  **DispVMs**
         1.  [Disposable VMs](/doc/DisposableVms/)
         2.  [DispVM Customization](/doc/UserDoc/DispVMCustomization/)