diff -urN cf.orig/m4/proto.m4 cf/m4/proto.m4
--- cf.orig/m4/proto.m4	2004-03-12 11:48:08.000000000 +0200
+++ cf/m4/proto.m4	2004-11-08 18:25:46.000000000 +0200
@@ -2051,7 +2051,10 @@
 R<?> <$+ < @ $+ >>	$: <$(access $2 $: ? $)> <$1 < @ $2 >>',`dnl')',
 `R$+ < @ $* $=R >	$@ RELAY
 ifdef(`_ACCESS_TABLE_', `dnl
-R$+ < @ $+ >		$: $>D <$2> <?> <+ To> <$1 < @ $2 >>',`dnl')')
+# R$+ < @ $+ >		$: $>D <$2> <?> <+ To> <$1 < @ $2 >>
+R$+ < @ $+ >		$: $1 < @ $2 > $| $>SearchList <+ To> $| <F:$1@$2> <D:$2> <F:$1@> <>
+R$+ < @ $+ > $| <$*>	$: <$3> <$1 <@ $2>>
+R$+ < @ $+ > $| $*	$: <$3> <$1 <@ $2>>',`dnl')')
 ifdef(`_ACCESS_TABLE_', `dnl
 dnl workspace: <Result-of-lookup | ?> <localpart<@domain>>
 R<RELAY> $*		$@ RELAY