diff --git a/src/main.cc b/src/main.cc
index ab287ec2f5..f21c15e298 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -933,7 +933,8 @@ int main(int argc, char** argv)
 								 "and set up the old comm. system.  "
 								 "Set the 'old_comm_usage_is_ok' flag "
 								 "to bypass this error if you've taken such "
-								 "actions.");
+								 "actions, but the suggested solution is to "
+								 "port scripts to use the new Broker API.");
 		}
 
 	RecordVal::ResizeParseTimeRecords();
diff --git a/testing/btest/Baseline/core.old_comm_usage/out b/testing/btest/Baseline/core.old_comm_usage/out
index 28585d78ba..219a2f5620 100644
--- a/testing/btest/Baseline/core.old_comm_usage/out
+++ b/testing/btest/Baseline/core.old_comm_usage/out
@@ -1,2 +1,2 @@
 warning in /Users/jon/projects/bro/bro/testing/btest/.tmp/core.old_comm_usage/old_comm_usage.bro, line 6: deprecated (terminate_communication)
-fatal error: Detected old, deprecated communication system usages that will not work unless you explicitly take action to initizialize and set up the old comm. system.  Set the 'old_comm_usage_is_ok' flag to bypass this error if you've taken such actions.
+fatal error: Detected old, deprecated communication system usages that will not work unless you explicitly take action to initizialize and set up the old comm. system.  Set the 'old_comm_usage_is_ok' flag to bypass this error if you've taken such actions, but the suggested solution is to port scripts to use the new Broker API.