diff --git a/deb/changes.go b/deb/changes.go
index d90874e5..67482e99 100644
--- a/deb/changes.go
+++ b/deb/changes.go
@@ -179,18 +179,24 @@ func (c *Changes) PackageQuery() (PackageQuery, error) {
 	var binaryQuery PackageQuery
 	if len(c.Binary) > 0 {
 		binaryQuery = &FieldQuery{Field: "Name", Relation: VersionEqual, Value: c.Binary[0]}
+		// matching debug ddeb packages, they're not present in the Binary field
+		var ddebQuery PackageQuery
+		ddebQuery = &FieldQuery{Field: "Name", Relation: VersionEqual, Value: fmt.Sprintf("%s-dbgsym", c.Binary[0])}
+
 		for _, binary := range c.Binary[1:] {
 			binaryQuery = &OrQuery{
 				L: &FieldQuery{Field: "Name", Relation: VersionEqual, Value: binary},
 				R: binaryQuery,
 			}
+			ddebQuery = &OrQuery{
+				L: &FieldQuery{Field: "Name", Relation: VersionEqual, Value: fmt.Sprintf("%s-dbgsym", binary)},
+				R: ddebQuery,
+			}
 		}
 
-		// matching debug ddeb packages, they're not present in the Binary field
-		var ddebQuery PackageQuery
 		ddebQuery = &AndQuery{
-			L: &FieldQuery{Field: "Name", Relation: VersionPatternMatch, Value: "*-dbgsym"},
-			R: &FieldQuery{Field: "Source", Relation: VersionEqual, Value: c.Source},
+			L: &FieldQuery{Field: "Source", Relation: VersionEqual, Value: c.Source},
+			R: ddebQuery,
 		}
 
 		binaryQuery = &OrQuery{