diff --git a/aplinfo/apltest.pl b/aplinfo/apltest.pl
index f6c84da9..7346f31d 100755
--- a/aplinfo/apltest.pl
+++ b/aplinfo/apltest.pl
@@ -13,8 +13,11 @@ foreach my $k (keys %{$pkglist->{'all'}}) {
     next if $k eq 'pve-web-news';
     my $res = $pkglist->{'all'}->{$k};
 
-    my $template = "$res->{os}-$res->{package}_$res->{version}_i386.tar.gz";
+    my $template = "$res->{os}-$res->{package}_$res->{version}_ARCH.tar.gz";
     $template =~ s/$res->{os}-$res->{os}-/$res->{os}-/;
+    
+    $k =~ s/_amd64\.tar\.gz$/_ARCH.tar.gz/;
+    $k =~ s/_i386\.tar\.gz$/_ARCH.tar.gz/;
 
     if ($k ne $template) {
 	print "ERROR: $k != $template\n";