diff --git a/perform-html.pl b/perform-html.pl
index ac34880..6475a3a 100755
--- a/perform-html.pl
+++ b/perform-html.pl
@@ -265,8 +265,7 @@ sub parse_result_files {
 	$cvsshort =~ s,T[^/]+Z,,;
 	$cvsshort =~ s,patch-([^/]*)\.\d+,$1,;
 	$cvsshort =~ s,modify-([^/]*)\.\d+,$1,;
-	$cvsshort =~ s,/, ,g;
-	$repshort =~ s/^btrace-(.*)\.\d+$/$1/ if $repeat;
+	$repshort =~ s,btrace-([^/]*)\.\d+,$1, if $repeat;
 	my $reldate = "$date";
 	$reldate = "$release/$reldate" if $release;
 	$R{$release}{dates}{$date} = 1 if $release;
diff --git a/setup-html.pl b/setup-html.pl
index 91462c5..303aa56 100755
--- a/setup-html.pl
+++ b/setup-html.pl
@@ -367,16 +367,15 @@ sub write_html_setup {
 	    foreach my $host (sort keys %$h) {
 		print $html "  <tr>\n    <th>$host</th>\n";
 		if ($repeat) {
-		    (my $repshort = $repeat) =~ s/^btrace-(.*)\.\d+$/$1/;
+		    (my $repshort = $repeat) =~ s,btrace-([^/]*)\.\d+,$1,;
 		    print $html "    <td title=\"$repeat\">$repshort</td>\n";
 		} elsif (@cvsdates && @{$D{$date}{$cvsdates[0]}{repeats}}) {
 		    print $html "    <td></td>\n";
 		}
 		if ($cvsdate) {
-		    (my $cvsshort = $cvsdate) =~ s/T.*//;
-		    $cvsshort =~ s/patch-(.*)\.\d+$/$1/;
-		    $cvsshort =~ s/modify-(.*)\.\d+$/$1/;
-		    $cvsshort =~ s/\.\d+//g;
+		    (my $cvsshort = $cvsdate) =~ s,T[^/]+Z,,;
+		    $cvsshort =~ s,patch-([^/]*)\.\d+,$1,;
+		    $cvsshort =~ s,modify-([^/]*)\.\d+,$1,;
 		    print $html "    <td title=\"$cvsdate\">$cvsshort</td>\n";
 		} elsif (@cvsdates) {
 		    print $html "    <td></td>\n";
@@ -502,15 +501,14 @@ sub write_html_build {
 	foreach my $host (sort keys %$h) {
 	    print $html "  <tr>\n    <th>$host</th>\n";
 	    if ($repeat) {
-		(my $repshort = $repeat) =~ s/^btrace-(.*)\.\d+$/$1/;
+		(my $repshort = $repeat) =~ s,btrace-([^/]*)\.\d+,$1,;
 		print $html "    <td title=\"$repeat\">$repshort</td>\n";
 	    } elsif (@repeats) {
 		print $html "    <td></td>\n";
 	    }
-	    (my $cvsshort = $cvsdate) =~ s/T.*//;
-	    $cvsshort =~ s/patch-(.*)\.\d+$/$1/;
-	    $cvsshort =~ s/modify-(.*)\.\d+$/$1/;
-	    $cvsshort =~ s/\.\d+//g;
+	    (my $cvsshort = $cvsdate) =~ s,T[^/]+Z,,;
+	    $cvsshort =~ s,patch-([^/]*)\.\d+,$1,;
+	    $cvsshort =~ s,modify-([^/]*)\.\d+,$1,;
 	    print $html "    <td title=\"$cvsdate\">$cvsshort</td>\n";
 	    my $version = $h->{$host}{version};
 	    my $time = encode_entities($h->{$host}{kerntime});
@@ -631,12 +629,11 @@ sub write_html_reboot {
 
     foreach my $host (sort keys %$h) {
 	print $html "  <tr>\n    <th>$host</th>\n";
-	(my $repshort = $repeat) =~ s/^btrace-(.*)\.\d+$/$1/;
+	(my $repshort = $repeat) =~ s,btrace-([^/]*)\.\d+,$1,;
 	print $html "    <td title=\"$repeat\">$repshort</td>\n";
-	(my $cvsshort = $cvsdate) =~ s/T.*//;
-	$cvsshort =~ s/patch-(.*)\.\d+$/$1/;
-	$cvsshort =~ s/modify-(.*)\.\d+$/$1/;
-	$cvsshort =~ s/\.\d+//g;
+	(my $cvsshort = $cvsdate) =~ s,T[^/]+Z,,;
+	$cvsshort =~ s,patch-([^/]*)\.\d+,$1,;
+	$cvsshort =~ s,modify-([^/]*)\.\d+,$1,;
 	print $html "    <td title=\"$cvsdate\">$cvsshort</td>\n";
 	my $version = $h->{$host}{version};
 	my $time = encode_entities($h->{$host}{kerntime});