diff --git a/trisquel-guix-installer.experimental.a-lec.org/Makefile b/trisquel-guix-installer.experimental.a-lec.org/Makefile
index a7c4435..7d248bc 100644
--- a/trisquel-guix-installer.experimental.a-lec.org/Makefile
+++ b/trisquel-guix-installer.experimental.a-lec.org/Makefile
@@ -21,6 +21,8 @@ TARBALL_SOURCE = \
 	config/class/50-host-classes \
 	config/files/etc/cron.d/fai/FAIBASE \
 	config/files/etc/fai/fai.conf/FAIBASE \
+	config/files/etc/hostname/FAIBASE \
+	config/files/etc/hosts/FAIBASE \
 	config/files/etc/network/interfaces.d/enp1s0.conf \
 	config/files/etc/network/interfaces.d/lo.conf \
 	config/files/etc/resolv.conf \
diff --git a/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hostname/FAIBASE b/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hostname/FAIBASE
new file mode 100644
index 0000000..68101e0
--- /dev/null
+++ b/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hostname/FAIBASE
@@ -0,0 +1 @@
+trisquel-guix-installer.experimental.a-lec.org
diff --git a/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hosts/FAIBASE b/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hosts/FAIBASE
new file mode 100644
index 0000000..adf4f78
--- /dev/null
+++ b/trisquel-guix-installer.experimental.a-lec.org/config/files/etc/hosts/FAIBASE
@@ -0,0 +1,7 @@
+127.0.0.1	localhost
+127.0.1.1	trisquel-guix-installer.experimental.a-lec.org
+
+# The following lines are desirable for IPv6 capable hosts
+::1     	localhost ip6-localhost ip6-loopback
+ff02::1 	ip6-allnodes
+ff02::2 	ip6-allrouters
diff --git a/trisquel-guix-installer.experimental.a-lec.org/config/scripts/FAIBASE/01-files b/trisquel-guix-installer.experimental.a-lec.org/config/scripts/FAIBASE/01-files
index 6f82e1a..4a2c5b4 100755
--- a/trisquel-guix-installer.experimental.a-lec.org/config/scripts/FAIBASE/01-files
+++ b/trisquel-guix-installer.experimental.a-lec.org/config/scripts/FAIBASE/01-files
@@ -17,6 +17,8 @@
 
 fcopy -i -m root,root,0755 /etc/cron.d/fai
 fcopy -iM /etc/fai/fai.conf
+fcopy -iM /etc/hostname
+fcopy -iM /etc/hosts
 fcopy -iM /etc/network/interfaces.d/lo.conf
 fcopy -iM /etc/network/interfaces.d/enp1s0.conf
 fcopy -iM /etc/resolv.conf