diff --git a/src/Services/ImportExportSystem/BOMImporter.php b/src/Services/ImportExportSystem/BOMImporter.php
index e511c04d..33a402cb 100644
--- a/src/Services/ImportExportSystem/BOMImporter.php
+++ b/src/Services/ImportExportSystem/BOMImporter.php
@@ -274,6 +274,13 @@ class BOMImporter
         $entries_by_key = []; // Track entries by name+part combination
         $mapped_entries = []; // Collect all mapped entries for validation
 
+        // Fetch suppliers once for efficiency
+        $suppliers = $this->entityManager->getRepository(\App\Entity\Parts\Supplier::class)->findAll();
+        $supplierSPNKeys = [];
+        foreach ($suppliers as $supplier) {
+            $supplierSPNKeys[] = $supplier->getName() . ' SPN';
+        }
+
         foreach ($csv->getRecords() as $offset => $entry) {
             // Apply field mapping to translate column names
             $mapped_entry = $this->applyFieldMapping($entry, $field_mapping, $field_priorities);
@@ -400,9 +407,14 @@ class BOMImporter
             if (isset($mapped_entry['Manufacturer'])) {
                 $comment_parts[] = 'Manf: ' . $mapped_entry['Manufacturer'];
             }
-            if (isset($mapped_entry['LCSC'])) {
-                $comment_parts[] = 'LCSC: ' . $mapped_entry['LCSC'];
+
+            // Add supplier part numbers dynamically
+            foreach ($supplierSPNKeys as $spnKey) {
+                if (isset($mapped_entry[$spnKey]) && !empty($mapped_entry[$spnKey])) {
+                    $comment_parts[] = $spnKey . ': ' . $mapped_entry[$spnKey];
+                }
             }
+
             if (isset($mapped_entry['Supplier and ref'])) {
                 $comment_parts[] = $mapped_entry['Supplier and ref'];
             }
diff --git a/tests/Services/ImportExportSystem/BOMImporterTest.php b/tests/Services/ImportExportSystem/BOMImporterTest.php
index 52c633d0..47ddcc24 100644
--- a/tests/Services/ImportExportSystem/BOMImporterTest.php
+++ b/tests/Services/ImportExportSystem/BOMImporterTest.php
@@ -353,6 +353,16 @@ class BOMImporterTest extends WebTestCase
 
     public function testStringToBOMEntriesKiCADSchematic(): void
     {
+        // Create test suppliers for this test
+        $lcscSupplier = new Supplier();
+        $lcscSupplier->setName('LCSC');
+        $mouserSupplier = new Supplier();
+        $mouserSupplier->setName('Mouser');
+
+        $this->entityManager->persist($lcscSupplier);
+        $this->entityManager->persist($mouserSupplier);
+        $this->entityManager->flush();
+
         $input = <<<CSV
         "Reference","Value","Footprint","Quantity","MPN","Manufacturer","LCSC SPN","Mouser SPN"
         "R1,R2","10k","R_0805_2012Metric",2,"CRCW080510K0FKEA","Vishay","C123456","123-M10K"
@@ -386,10 +396,20 @@ class BOMImporterTest extends WebTestCase
         $this->assertStringContainsString('Value: 10k', $bom_entries[0]->getComment());
         $this->assertStringContainsString('MPN: CRCW080510K0FKEA', $bom_entries[0]->getComment());
         $this->assertStringContainsString('Manf: Vishay', $bom_entries[0]->getComment());
+        $this->assertStringContainsString('LCSC SPN: C123456', $bom_entries[0]->getComment());
+        $this->assertStringContainsString('Mouser SPN: 123-M10K', $bom_entries[0]->getComment());
+
 
         // Check second entry
         $this->assertEquals('C1', $bom_entries[1]->getMountnames());
         $this->assertEquals(1.0, $bom_entries[1]->getQuantity());
+        $this->assertStringContainsString('LCSC SPN: C789012', $bom_entries[1]->getComment());
+        $this->assertStringContainsString('Mouser SPN: 80-CL21A104KOCLRNC', $bom_entries[1]->getComment());
+
+        // Clean up
+        $this->entityManager->remove($lcscSupplier);
+        $this->entityManager->remove($mouserSupplier);
+        $this->entityManager->flush();
     }
 
     public function testStringToBOMEntriesKiCADSchematicWithPriority(): void