diff --git a/setup.sh b/setup.sh
index 8730638..82c4407 100644
--- a/setup.sh
+++ b/setup.sh
@@ -41,6 +41,8 @@ if [ "$diskcount" -gt "6" ]; then diskoptions="11 35 4 raidz2 off raidz3 off mir
 if [ "$diskcount" -gt "11" ]; then diskoptions="10 35 3 raidz3 off mirror off none off"; fi
 raidtype=`dialog --no-items --no-cancel --title "Root pool ZFS RAID" --radiolist "Select root pool ZFS RAID type:" $diskoptions 2>&1 1>/dev/tty`
 hostname=""; while [ -z "$hostname" ]; do hostname=`dialog --no-cancel --inputbox "Hostname:" 8 40 2>&1 >/dev/tty`; done
+domainname=""; while [ -z "$domainname" ]; do domainname=`dialog --no-cancel --inputbox "Domain name root (for fully qualified domain, e.g. company.com):" 8 40 2>&1 >/dev/tty`; done
+fqdn="${hostname}.${domainname}"
 nicdevices=""; for nic in $(ip -o link show | awk -F': ' '{print $2}' | grep -v '^lo'); do nicdevices="$nicdevices $nic off"; done
 nics=`dialog --separate-output --no-cancel --no-items --title "Bridged network devices" --checklist "Select the network devices to be bridged to br0:" $height $width ${window}$nicdevices 2>&1 1>/dev/tty`
 admin=""; while [ -z "$admin" ]; do admin=`dialog --no-cancel --inputbox "Admin user:" 8 40 2>&1 >/dev/tty`; done
@@ -144,7 +146,7 @@ echo "Done."
 
 echo ""
 echo "Setting hostname..."
-echo "$hostname" > /mnt/etc/hostname
+echo "$hostname $fqdn" > /mnt/etc/hostname
 echo "127.0.1.1 $hostname" >> /mnt/etc/hosts
 echo "Done."
 
@@ -215,6 +217,7 @@ echo "Done."
 echo ""
 echo "Entering chroot..."
 echo "#!/bin/bash" > /mnt/setup-chroot.sh
+echo "HOSTNAME=\"$hostname\"" >> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 echo "echo \"\"" >> /mnt/setup-chroot.sh
 echo "echo \"Mounting /proc/self/mounts...\"" >> /mnt/setup-chroot.sh