diff --git a/CHANGES b/CHANGES
index ee0a1a6..29db694 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+  - Michael Scherer <misc@mandriva.org>: more explicit messages for
+    vhost plugin verification (give the name of vhost)  
+
   - Michael Scherer <misc@mandriva.org>: more helpful error
     messages in logs after dialback failure (shows hosts in question)
 
diff --git a/lib/DJabberd/VHost.pm b/lib/DJabberd/VHost.pm
index fde9763..2db2d76 100644
--- a/lib/DJabberd/VHost.pm
+++ b/lib/DJabberd/VHost.pm
@@ -96,21 +96,21 @@ sub setup_default_plugins {
     my $self = shift;
     unless ($self->are_hooks("deliver")) {
         unless ($self->has_plugin_of_type("DJabberd::Delivery::Local")) {
-            $logger->logwarn("Adding implicit plugin DJabberd::Delivery::Local");
+            $logger->logwarn("$self->{server_name} : adding implicit plugin DJabberd::Delivery::Local");
             $self->add_plugin(DJabberd::Delivery::Local->new);
         }
         if ($self->s2s && ! $self->has_plugin_of_type("DJabberd::Delivery::S2S")) {
-            $logger->logwarn("Adding implicit plugin DJabberd::Delivery::S2S");
+            $logger->logwarn("$self->{server_name} : adding implicit plugin DJabberd::Delivery::S2S");
             $self->add_plugin(DJabberd::Delivery::S2S->new);
         }
     }
 
     unless ($self->has_plugin_of_type("DJabberd::Delivery::Local")) {
-        $logger->logwarn("No DJabberd::Delivery::Local delivery plugin configured");
+        $logger->logwarn("$self->{server_name} : no DJabberd::Delivery::Local delivery plugin configured");
     }
 
     if ($self->s2s && ! $self->has_plugin_of_type("DJabberd::Delivery::S2S")) {
-        $logger->logdie("s2s enabled, but no implicit or explicit DJabberd::Delivery::S2S plugin.");
+        $logger->logdie("$self->{server_name} : s2s enabled, but no implicit or explicit DJabberd::Delivery::S2S plugin.");
     }
 
     unless ($self->are_hooks("PresenceCheck")) {
@@ -292,7 +292,7 @@ sub name {
 # vhost method
 sub add_plugin {
     my ($self, $plugin) = @_;
-    $logger->info("Adding plugin: $plugin");
+    $logger->info("$self->{server_name} : adding plugin: $plugin");
     $self->{plugin_types}{ref $plugin} = 1;
     $plugin->register($self);
 }