--- sendmail-8.13.1/cf/m4/proto.m4	2004-07-27 13:32:48.000000000 -0400
+++ sendmail-8.13.1-jm/cf/m4/proto.m4	2004-10-06 12:21:26.000000000 -0400
@@ -1029,6 +1029,14 @@
 #
 
 SParse1
+
+ifdef(`_PRESERVE_HOST_ON_LOCAL_',`dnl
+#Store rcpt to host for later usage when - the mail hub feature
+R$+ <  @ $+ >			$: $(macro {ORIG_HOST} $@ $) $1 < @ $2 >
+R$+ <  @ $+ >			$: $(macro {ORIG_HOST} $@ $2 $) $1 < @ $2 >',
+`dnl')
+
+
 ifdef(`_LDAP_ROUTING_', `dnl
 # handle LDAP routing for hosts in $={LDAPRoute}
 R$+ < @ $={LDAPRoute} . >	$: $>LDAPExpand <$1 < @ $2 . >> <$1 @ $2> <>
@@ -1257,11 +1277,20 @@
 ifdef(`_PRESERVE_LUSER_HOST_', `dnl
 dnl it is $~[ instead of $- to avoid matches on IPv6 addresses
 R< $~[ : $+ > $+ @ $+	$: $>MailerToTriple < $1 : $2 > $3 < @ $4 >')
+ifdef(`_PRESERVE_HOST_ON_LOCAL_',`dnl
+R< $~[ : $+ > $+ @ $+	$: < $1 [ : $2 > $3 < @ $&{ORIG_HOST} >
+R< $~[ : $+ > $+ < @ >	$: < $1 [ : $2 > $3
+R< $~[ : $+ > $+ < @ $+ >	$@ $>MailerToTriple < $1 : $2 > $3 < @ $4 >
+',`dnl')
 R< $~[ : $+ > $+	$: $>MailerToTriple < $1 : $2 > $3 < @ $2 >
 ifdef(`_PRESERVE_LUSER_HOST_', `dnl
 R< $+ > $+ @ $+		$@ $>MailerToTriple < $1 > $2 < @ $3 >')
+ifdef(`_PRESERVE_HOST_ON_LOCAL_',`dnl
+R< $+ > $+		$: < $1 > $2 < @ $&{ORIG_HOST} >
+R< $+ > $+ < @ >	$: < $1 > $2
+R< $+ > $+ < @ $+ >	$@ $>MailerToTriple < $1 > $2 < @ $3 >
+',`dnl')
 R< $+ > $+		$@ $>MailerToTriple < $1 > $2 < @ $1 >
-
 ifdef(`_MAILER_TABLE_', `dnl
 ifdef(`_LDAP_ROUTING_', `dnl
 ###################################################################