diff --git a/DebianTweaks.sh b/DebianTweaks.sh
index deb2bab..a85a767 100755
--- a/DebianTweaks.sh
+++ b/DebianTweaks.sh
@@ -2,7 +2,7 @@
 
 echo "--------------------"
 echo Set the correct mailer fqdn
-echo $(hostname -f) > /etc/mailname
+hostname -f > /etc/mailname
 
 echo "--------------------"
 echo Forward mail to root
@@ -17,7 +17,7 @@ rm /tmp/crontab.temp
 
 echo "--------------------"
 echo Better logon-message
-figlet $(hostname)>/etc/motd
+figlet "$(hostname)">/etc/motd
 
 echo "--------------------"
 echo Apt Updates