diff --git a/run.sh b/run.sh
index f06f8be..5cec517 100644
--- a/run.sh
+++ b/run.sh
@@ -18,6 +18,7 @@ cat >/etc/rsyslog.conf <<EOF
 \$FileCreateMode 0640
 \$DirCreateMode 0755
 \$Umask 0022
+\$PreserveFQDN on
 
 module(load="imudp")
 input(type="imudp" port="514" )
@@ -27,6 +28,10 @@ input(type="imtcp" port="514" )
 
 module(load="mmutf8fix")
 action(type="mmutf8fix" replacementChar="?" )
+
+# If the hostname is not specified, we use fromhost
+if (\$hostname == '') then set \$!hostname = \$fromhost;
+
 EOF
 
 if [ "${TARGET_PROTO}" = "udp" ] ; then