2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 65d683aa..65c4049d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------
+Version 2.0.4 STABLE (rgerhards), 2008-03-??
+- bugfix: internally generated messages had "FROMHOST" property not set
+---------------------------------------------------------------------------
 Version 2.0.3 STABLE (rgerhards), 2008-03-12
 - bugfix: setting for $EscapeCopntrolCharactersOnReceive was not 
   properly initialized
diff --git a/syslogd.c b/syslogd.c
index 06780bf9..a28c2566 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2256,6 +2256,7 @@ logmsgInternal(int pri, char *msg, int flags)
 	MsgSetUxTradMsg(pMsg, msg);
 	MsgSetRawMsg(pMsg, msg);
 	MsgSetHOSTNAME(pMsg, LocalHostName);
+	MsgSetRcvFrom(pMsg, LocalHostName);
 	MsgSetTAG(pMsg, "rsyslogd:");
 	pMsg->iFacility = LOG_FAC(pri);
 	pMsg->iSeverity = LOG_PRI(pri);