diff --git a/webtools/tinderbox/admintree.cgi b/webtools/tinderbox/admintree.cgi
index 1a1b1df438e..2625dbec457 100755
--- a/webtools/tinderbox/admintree.cgi
+++ b/webtools/tinderbox/admintree.cgi
@@ -41,6 +41,7 @@ tb_load_data();
 if (defined($tree)) {
     if( -r "$tree/mod.pl" ){
         require "$tree/mod.pl";
+        $message_of_day =~ s/\s*$//;  # Trim trailing whitespace;
     }
     else {
         $message_of_day = "";