--- distrib/rsyslog_traps_rsyslog.conf	2014-11-19 10:59:28.000000000 +0100
+++ modif/rsyslog_traps_rsyslog.conf	2015-03-06 12:55:32.344390558 +0100
@@ -1,6 +1,6 @@
 # Templates for local and remote logging
-$template DynLocalRsyslog, "/var/log/rsyslog/local/rsyslog/rsyslog.%syslogseverity-text%.log" 
-$template DynRemoteRsyslog, "/var/log/rsyslog/remote/%fromhost%/rsyslog/rsyslog.%syslogseverity-text%.log" 
+$template DynLocalRsyslog, "/var/log/rsyslog/local/rsyslog/rsyslog.%syslogseverity-text%.log"
+$template DynRemoteRsyslog, "/var/log/rsyslog/remote/%fromhost%/%hostname%/rsyslog/rsyslog.%syslogseverity-text%.log"
 %if %%activer_reception_logs == 'non'
 # all messages go in local branch
 :programname, startswith, "rsyslog" ?DynLocalRsyslog