diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm
index cafe751e..8531d699 100644
--- a/lib/Lacuna/DB/Result/Spies.pm
+++ b/lib/Lacuna/DB/Result/Spies.pm
@@ -1860,7 +1860,7 @@ sub take_control_of_probe {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Spies','Alert'],
         filename    => 'probe_destroyed.txt',
-        params      => [$probe->star->x, $probe->star->y, $probe->star->name],
+        params      => [$probe->body->id, $probe->body->name, $probe->star->x, $probe->star->y, $probe->star->name],
     );
     $self->on_body->add_news(25,'%s scientists say they have lost control of a research satellite in the %s system.', $self->on_body->empire->name, $probe->star->name);    
     my $message = $self->empire->send_predefined_message(
diff --git a/lib/Lacuna/Role/Ship/Arrive/DestroyProbes.pm b/lib/Lacuna/Role/Ship/Arrive/DestroyProbes.pm
index 73631b1e..0edaa1bb 100644
--- a/lib/Lacuna/Role/Ship/Arrive/DestroyProbes.pm
+++ b/lib/Lacuna/Role/Ship/Arrive/DestroyProbes.pm
@@ -15,13 +15,13 @@ after handle_arrival_procedures => sub {
     # find probes to destroy
     my $probes = Lacuna->db->resultset('Lacuna::DB::Result::Probes')->search({star_id => $self->foreign_star_id });
     my $count;
-    
+
     # destroy those suckers
     while (my $probe = $probes->next) {
         $probe->empire->send_predefined_message(
             tags        => ['Attack','Alert'],
             filename    => 'probe_detonated.txt',
-            params      => [$self->foreign_star->x, $self->foreign_star->y, $self->foreign_star->name, $self->body->empire_id, $self->body->empire->name],
+            params      => [$probe->body->id, $probe->body->name, $self->foreign_star->x, $self->foreign_star->y, $self->foreign_star->name, $self->body->empire_id, $self->body->empire->name],
         );
         $count++;
         $probe->delete;
diff --git a/var/messages/probe_destroyed.txt b/var/messages/probe_destroyed.txt
index 0f0251f6..384eca93 100644
--- a/var/messages/probe_destroyed.txt
+++ b/var/messages/probe_destroyed.txt
@@ -1,6 +1,6 @@
 Lost Contact With Probe
 ~~~
-We have just lost contact with the probe tasked to the {Starmap %s %s %s} system. We have to assume it has been disabled by enemy forces.
+We have just lost contact with the probe from {Planet %s %s} tasked to the {Starmap %s %s %s} system. We have to assume it has been disabled by enemy forces.
 
 Regards,
 
diff --git a/var/messages/probe_detonated.txt b/var/messages/probe_detonated.txt
index 76acc181..e1c7b6f6 100644
--- a/var/messages/probe_detonated.txt
+++ b/var/messages/probe_detonated.txt
@@ -1,6 +1,6 @@
 Probe Destroyed
 ~~~
-We just lost contact with our probe in the {Starmap %s %s %s} system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by {Empire %s %s}. We must assume the probe has been destroyed.
+We just lost contact with our probe from {Planet %s %s} in the {Starmap %s %s %s} system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by {Empire %s %s}. We must assume the probe has been destroyed.
 
 Regards,
 
diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt
index 0ac96e6a..bb748888 100644
--- a/var/www/public/changes.txt
+++ b/var/www/public/changes.txt
@@ -1,3 +1,6 @@
+3.0601
+ - Fix: Probe destroyed/detonated messages will include the probe's planet of origin.
+
 3.0600
  - API: Added trash methods to the Inbox.
  - API: Parliament messages will be tagged as such instead of Correspondence.