diff --git a/tools/generate_firmware_patterns b/tools/generate_firmware_patterns
index b6bb6910..600dea6c 100755
--- a/tools/generate_firmware_patterns
+++ b/tools/generate_firmware_patterns
@@ -29,9 +29,12 @@ use YAML::XS;
 my $output_dir = '.';
 my $test;
 my $verbose;
+my $pkgname = "ALL";
+
 GetOptions( "output-dir=s" => \$output_dir,
             "test"         => \$test,
-            "verbose"      => \$verbose )
+            "verbose"      => \$verbose,
+            "package=s"    => \$pkgname)
     or die "Error in command line arguments";
 
 
@@ -70,16 +73,19 @@ sub process_components {
         print STDERR "found modaliases entries for firmware package ", $array->{Package}, "\n"
             if $verbose;
 
-        my $patterns_file = $output_dir . "/" . $array->{Package} . ".patterns";
-        printf STDERR "writing %d entries to %s\n",
-            (scalar @{ $array->{Provides}->{modaliases} }),
-            $patterns_file;
+	if ($pkgname eq "ALL" or $pkgname eq $array->{Package}) {
 
-        # For each alias, anchor the pattern on the left (^) and on
-        # the right ($), and replace each '*' with '.*':
-        write_file($patterns_file,
-                   format_alias( @{ $array->{Provides}->{modaliases} } ));
-        push @packages, $array->{Package};
+	    my $patterns_file = $output_dir . "/" . $array->{Package} . ".patterns";
+	    printf STDERR "writing %d entries to %s\n",
+		(scalar @{ $array->{Provides}->{modaliases} }),
+		$patterns_file;
+
+	    # For each alias, anchor the pattern on the left (^) and on
+	    # the right ($), and replace each '*' with '.*':
+	    write_file($patterns_file,
+		       format_alias( @{ $array->{Provides}->{modaliases} } ));
+	    push @packages, $array->{Package};
+	}
     }
     return @packages;
 }
@@ -95,7 +101,7 @@ if (! -d $output_dir) {
 write_file("$output_dir/README.txt",
            "These files help Debian Installer detect helpful firmware packages (via hw-detect).\n");
 
-# Generate a .patterns file for each firmware package found in
+# Generate .patterns file to match firmware packages found in
 # Components-* files:
 my @all_packages;
 foreach my $component (@ARGV) {
@@ -103,7 +109,7 @@ foreach my $component (@ARGV) {
     push @all_packages, @packages;
 }
 @all_packages = sort @all_packages;
-print STDERR "all firmware packages found across all components: @all_packages\n"
+print STDERR "firmware packages found across all components: @all_packages\n"
     if $verbose;
 
 # Workaround for firmware-sof-signed, which doesn't advertise firmware
@@ -114,44 +120,49 @@ print STDERR "all firmware packages found across all components: @all_packages\n
 # XXX: To be kept in sync!
 my $SOF = 'firmware-sof-signed';
 if (! grep { $_ eq $SOF } @all_packages) {
-    # Extract on amd64, from the installed package, with the following
-    # command. Note that descending under intel/ would lead to no
-    # aliases, so stick to the top-level directory for sof:
-    #
-    #     for x in $(dpkg -L linux-image-5.10.0-8-amd64 | grep kernel/sound/soc/sof/.*\.ko$); do /usr/sbin/modinfo $x | awk '/^alias:/ { print $2 }'; done | sort
-    #
-    # XXX: If that's not enough, there are other modules matching the
-    #      kernel/sound/soc/intel/boards/snd-soc-sof*.ko pattern.
-    my @sof_aliases = qw(
-        pci:v00008086d000002C8sv*sd*bc*sc*i*
-        pci:v00008086d000006C8sv*sd*bc*sc*i*
-        pci:v00008086d0000119Asv*sd*bc*sc*i*
-        pci:v00008086d00001A98sv*sd*bc*sc*i*
-        pci:v00008086d00003198sv*sd*bc*sc*i*
-        pci:v00008086d000034C8sv*sd*bc*sc*i*
-        pci:v00008086d000038C8sv*sd*bc*sc*i*
-        pci:v00008086d00003DC8sv*sd*bc*sc*i*
-        pci:v00008086d000043C8sv*sd*bc*sc*i*
-        pci:v00008086d00004B55sv*sd*bc*sc*i*
-        pci:v00008086d00004B58sv*sd*bc*sc*i*
-        pci:v00008086d00004DC8sv*sd*bc*sc*i*
-        pci:v00008086d00005A98sv*sd*bc*sc*i*
-        pci:v00008086d00009DC8sv*sd*bc*sc*i*
-        pci:v00008086d0000A0C8sv*sd*bc*sc*i*
-        pci:v00008086d0000A348sv*sd*bc*sc*i*
-        pci:v00008086d0000A3F0sv*sd*bc*sc*i*
-        platform:sof-audio
-    );
 
-    print STDERR "deploying manual workaround for $SOF\n"
-        if $verbose;
+    if ($pkgname eq 'ALL' or $pkgname eq 'firmware-sof-signed') {
 
-    my $sof_file = $output_dir . "/" . $SOF . ".patterns";
-    printf STDERR "writing %d entries to %s\n",
-        (scalar @sof_aliases),
-        $sof_file;
+	# Extract on amd64, from the installed package, with the following
+	# command. Note that descending under intel/ would lead to no
+	# aliases, so stick to the top-level directory for sof:
+	#
+	#     for x in $(dpkg -L linux-image-5.10.0-8-amd64 | grep kernel/sound/soc/sof/.*\.ko$); do /usr/sbin/modinfo $x | awk '/^alias:/ { print $2 }'; done | sort
+	#
+	# XXX: If that's not enough, there are other modules matching the
+	#      kernel/sound/soc/intel/boards/snd-soc-sof*.ko pattern.
 
-    write_file($sof_file,
-               format_alias(@sof_aliases));
-    push @all_packages, $SOF;
+	my @sof_aliases = qw(
+            pci:v00008086d000002C8sv*sd*bc*sc*i*
+	    pci:v00008086d000006C8sv*sd*bc*sc*i*
+	    pci:v00008086d0000119Asv*sd*bc*sc*i*
+            pci:v00008086d00001A98sv*sd*bc*sc*i*
+            pci:v00008086d00003198sv*sd*bc*sc*i*
+            pci:v00008086d000034C8sv*sd*bc*sc*i*
+            pci:v00008086d000038C8sv*sd*bc*sc*i*
+            pci:v00008086d00003DC8sv*sd*bc*sc*i*
+            pci:v00008086d000043C8sv*sd*bc*sc*i*
+            pci:v00008086d00004B55sv*sd*bc*sc*i*
+            pci:v00008086d00004B58sv*sd*bc*sc*i*
+            pci:v00008086d00004DC8sv*sd*bc*sc*i*
+            pci:v00008086d00005A98sv*sd*bc*sc*i*
+            pci:v00008086d00009DC8sv*sd*bc*sc*i*
+            pci:v00008086d0000A0C8sv*sd*bc*sc*i*
+            pci:v00008086d0000A348sv*sd*bc*sc*i*
+            pci:v00008086d0000A3F0sv*sd*bc*sc*i*
+            platform:sof-audio
+	);
+
+	print STDERR "deploying manual workaround for $SOF\n"
+	    if $verbose;
+
+	my $sof_file = $output_dir . "/" . $SOF . ".patterns";
+	printf STDERR "writing %d entries to %s\n",
+	    (scalar @sof_aliases),
+	    $sof_file;
+
+	write_file($sof_file,
+		   format_alias(@sof_aliases));
+	push @all_packages, $SOF;
+    }
 }