diff --git a/howto/ganeti.md b/howto/ganeti.md
index fe3d90a83e9a71a155aa1de0bdb0a166068b23cd..6045526894e322ff450d1efc442d3ad9a74713e0 100644
--- a/howto/ganeti.md
+++ b/howto/ganeti.md
@@ -930,6 +930,8 @@ master failover scenario.
 The [walkthrough](http://docs.ganeti.org/ganeti/2.15/html/walkthrough.html) also has a few recipes to resolve common
 problems.
 
+See also the [common issues page](https://github.com/ganeti/ganeti/wiki/Common-Issues) in the Ganeti wiki.
+
 ## Disaster recovery
 
 If things get completely out of hand and the cluster becomes too
@@ -1505,3 +1507,6 @@ are available in the [Tor VM hosts.xlsx](https://nc.torproject.net/apps/onlyoffi
 ## Alternatives considered
 
 <!-- include benchmarks and procedure if relevant -->
+
+Note that the instance install is possible also [through FAI, see the
+Ganeti wiki for examples](https://github.com/ganeti/ganeti/wiki/System-template-with-FAI).
diff --git a/howto/new-machine.md b/howto/new-machine.md
index 80b05efacf027dc43c6beb269bd2661f9efaea11..a61b46283bd54cea9502956f1017b433a1d58d3f 100644
--- a/howto/new-machine.md
+++ b/howto/new-machine.md
@@ -299,7 +299,9 @@ TBD.
    since buster, might require complex setup (e.g. an NFS server),
    [setup-storage(8)](https://manpages.debian.org/buster/fai-setup-storage/setup-storage.8.en.html) might be reusable on its own. uses Tar-based
    images created by FAI itself, requires network control or custom
-   ISO boot, requires a "server" (the [fai-server](https://packages.debian.org/unstable/fai-server) package)
+   ISO boot, requires a "server" (the [fai-server](https://packages.debian.org/unstable/fai-server) package), not
+   directly supported by Ganeti, although there are [hacks to make it
+   work](https://github.com/ganeti/ganeti/wiki/System-template-with-FAI)
  * [himblick](https://github.com/himblick/himblick) has some interesting post-install configure bits in
    Python, along with pyparted bridges
  * [list of debian setup tools](https://wiki.debian.org/SystemBuildTools), see also