diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ce185d903..75e3502fe 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2919,7 +2919,7 @@ sub git_tag {
 	my $comment = $tag{'comment'};
 	foreach my $line (@$comment) {
 		chomp($line);
-		print esc_html($line) . "<br/>\n";
+		print esc_html($line, -nbsp=>1) . "<br/>\n";
 	}
 	print "</div>\n";
 	git_footer_html();