diff --git a/conf/fai.conf b/conf/fai.conf
index 519df648f..bb85f48b5 100644
--- a/conf/fai.conf
+++ b/conf/fai.conf
@@ -1,28 +1,17 @@
 # $Id$
 
 # /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
+# See fai.conf(5) for detailed information.
 
-# how to access the fai config space
-# If undefined here, make-fai-nfsroot/fai-setup will use default value
-# nfs://<install server>/$FAI_CONFIGDIR
-# examples of supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
-# git, git+http, hg+http, tarball via http. See fai.conf(5) for the full list.
+# URL to access the fai config space
+# If undefined here, use default nfs://<install server>/$FAI_CONFIGDIR
 #FAI_CONFIG_SRC=nfs://yourservername/path/to/config/space
 
-# LOGUSER: an account on the install server which saves all log-files
-# and which can change the kernel that is booted via network.
-# Configure .rhosts for this account and PAM, so that root can log in
-# from all install clients without password. This account should have
-# write permissions for /srv/tftp/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
-# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
-# Define it, to enable it, eg. LOGUSER=fai
+# Account for saving log files and calling fai-chboot. If undefined, this feature is disabled.
 #LOGUSER=fai
 
-# set protocol type for saving logs. Values: ssh, rsh, ftp
-# defaults to ssh, will be used only if LOGUSER is also set
+# protocol type for saving logs. Default is ssh.
 #FAI_LOGPROTO=ssh
 
-# Access to Debian mirror via NFS mounted directory
-# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
-#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
+# Access to Debian mirror via NFS mounted directory.
+#FAI_DEBMIRROR=<yournfs debianmirror>:/path/to/debianmirror