--- scripts/dkimproxy.out.orig	2016-11-08 12:35:41 UTC
+++ scripts/dkimproxy.out
@@ -314,17 +314,11 @@ sub process_request
 {
 	my $self = shift;
 
-	# try to determine peer's address
-	use Socket;
-	my $peersockaddr = getpeername(STDOUT);
-	my ($port, $iaddr) = sockaddr_in($peersockaddr);
-	$ENV{REMOTE_ADDR} = inet_ntoa($iaddr);
-
 	# initialize syslog
 	eval
 	{
 		openlog("dkimproxy.out", "perror,pid,ndelay", "mail");
-		syslog("debug", '%s', "connect from $ENV{REMOTE_ADDR}");
+		syslog("debug", '%s', "connect from $self->{server}->{peeraddr}");
 	};
 	if (my $E = $@)
 	{
@@ -713,7 +707,7 @@ which have a sender matching one of thes
 matched domain as the d= value of the generated signature.
 
 Please note that the d= value of the generated signature can also be
-specified using signature options (see L</"SIGNATURE OPTIONS"). The
+specified using signature options (see L</"SIGNATURE OPTIONS">). The
 signature options will override the value specified here.
 
 Therefore, if you want to sign all messages, and you are specifying