diff --git a/mkmotd/mkmotd.pl b/mkmotd/mkmotd.pl
index d4d3aff..fe5f448 100755
--- a/mkmotd/mkmotd.pl
+++ b/mkmotd/mkmotd.pl
@@ -107,7 +107,7 @@ sub policy {				# policy('theinternet') --> ('zeile1,'zeile2',....)
 my @pc=`cat /proc/cpuinfo`;
 my $mn='unknown CPU';
 $T{NCPU} = grep {/model name/ and $mn = $_; /processor/} @pc;
-$mn =~ s/\(.*?\)|\d+-Core Processor|xeon|Virtual|Athlon|model name\s*:|six.core|quad.core|dual.core|intel|Processor|cpu|core//ig;
+$mn =~ s/\(.*?\)|\d+-Core Processor|xeon|Virtual|Athlon|model name\s*:|six.core|quad.core|dual.core|intel|Processor|cpu|core| with Radeon Vega Graphics//ig;
 $mn =~ s/\s(E\d\-)\s/$1/;
 $mn =~ s/\s\d\s\@/ \@/;
 $mn =~ s/version\s+/v/g;
@@ -155,12 +155,12 @@ sub policy {				# policy('theinternet') --> ('zeile1,'zeile2',....)
   ($pn ne '') and $pn = " $pn";
   $T{SYSTEM} = "$mf$pn";
   $T{SYSTEM} =~ s/_/ /g;
-  $T{SYSTEM} =~ s{( WorkStation| Transport| Tower|Hewlett-Packard |/S2932-E/S2932-SI| Thunder| Computer Corp|Technology Co., Ltd. | Standard PC)}{}i;
+  $T{SYSTEM} =~ s{(^HP | WorkStation| Transport| Tower|Hewlett-Packard |/S2932-E/S2932-SI| Thunder| Computer Corp|Technology Co., Ltd. | Standard PC)}{}i;
 }
 
 my %BC = (
   'bugblatterbeastoftraal' => 'TYAN VX50 B4985',
-  'crap03' => 'TYAN GT20-B2925/B2925-E',
+#  'crap03' => 'TYAN GT20-B2925/B2925-E',
   'keineahnung' => 'FUJITSU ESPRIMO P756',
   'furunkel' => 'HP Z200 Workstation',
 );