diff --git a/Changes b/Changes
index 6285b70..493b233 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 0.26-dev
 
+  Set the process name to "qpsmtpd [1.2.3.4 : host.name.tld]"
+
   Fixed timeout bug when the client sent DATA and then stopped before
   sending the next line. (Gergely Risko <risko@risko.hu>) 
 
diff --git a/lib/Qpsmtpd/TcpServer.pm b/lib/Qpsmtpd/TcpServer.pm
index 9ff6eb8..bf0f798 100644
--- a/lib/Qpsmtpd/TcpServer.pm
+++ b/lib/Qpsmtpd/TcpServer.pm
@@ -15,6 +15,8 @@ sub start_connection {
     my $remote_info = $ENV{TCPREMOTEINFO} ? "$ENV{TCPREMOTEINFO}\@$remote_host" : $remote_host;
     my $remote_ip   = $ENV{TCPREMOTEIP};
 
+    $0 = "$0 [$remote_ip : $remote_host]";
+
     $self->SUPER::connection->start(remote_info => $remote_info,
 				    remote_ip   => $remote_ip,
 				    remote_host => $remote_host,