diff --git a/vunit/builtins.py b/vunit/builtins.py
index e0d4e9622..01e261776 100644
--- a/vunit/builtins.py
+++ b/vunit/builtins.py
@@ -165,13 +165,16 @@ def _add_osvvm(self):
             ):
                 continue
 
-            if not supports_vhdl_package_generics and (
-                bname
-                in [
-                    "ScoreboardGenericPkg.vhd",
-                    "ScoreboardPkg_int.vhd",
-                    "ScoreboardPkg_slv.vhd",
-                ]
+            if (supports_vhdl_package_generics and str(bname).endswith("_c.vhd")) or (
+                not supports_vhdl_package_generics
+                and (
+                    bname
+                    in [
+                        "ScoreboardGenericPkg.vhd",
+                        "ScoreboardPkg_int.vhd",
+                        "ScoreboardPkg_slv.vhd",
+                    ]
+                )
             ):
                 continue