diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c
index 95d802f7688..5aed9ad3e5e 100644
--- a/sys/dev/acpica/acpi_spmc.c
+++ b/sys/dev/acpica/acpi_spmc.c
@@ -516,8 +516,8 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec
 		 */
 		revision = detail->Package.Elements[0].Integer.Value;
 		if (revision != 0) {
-			device_printf(sc->dev, "Unknown revision %d for "
-			    "device constraint detail package\n", revision);
+			device_printf(sc->dev, "Intel: Unknown revision %d for "
+			    "constraint %zu's detail package\n", revision, i);
 			sc->constraint_count--;
 			continue;
 		}
@@ -553,7 +553,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object)
 	constraints = &object->Package.Elements[2];
 
 	if (constraints->Package.Count != constraint_count) {
-		device_printf(sc->dev, "constraint count mismatch (%d to %zu)\n",
+		device_printf(sc->dev,
+		    "AMD: Constraints: Count mismatch (%d to %zu)\n",
 		    constraints->Package.Count, constraint_count);
 		return (ENXIO);
 	}
@@ -566,7 +567,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object)
 		/* Parse the constraint package. */
 		constraint_obj = &constraints->Package.Elements[i];
 		if (constraint_obj->Package.Count != 4) {
-			device_printf(sc->dev, "constraint %zu has %d elements\n",
+			device_printf(sc->dev,
+			    "AMD: Constraint %zu has %d elements, not 4\n",
 			    i, constraint_obj->Package.Count);
 			acpi_spmc_free_constraints(sc);
 			return (ENXIO);