diff --git a/jessie-server-common.sh b/jessie-server-common.sh
index 8ea51fd..083dbb8 100644
--- a/jessie-server-common.sh
+++ b/jessie-server-common.sh
@@ -19,15 +19,17 @@ EOF
     wget -O /root/.zshrc http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
     chsh -s /bin/zsh
 
-    ne /etc/hostname /etc/hosts
+    ( exec ne /etc/hostname /etc/hosts )
+
+    hostname -F /etc/hostname
 
     echo "Nice motd."
-    figlet `hostname -f` > /etc/motd
+    figlet `hostname -f | sed 's/\./ \. /'` > /etc/motd
 
     echo "Install system and security utils."
     apt install -y systemd-cron apticron ssmtp logwatch
     
-    ne /etc/ssmtp/*
+    ( exec ne /etc/ssmtp/* )
 }