--- a/tools/generate-history	Mon Sep 05 05:00:46 2016 -0700
+++ b/tools/generate-history	Mon Sep 26 08:04:04 2016 -0700
@@ -5,6 +5,13 @@
   if (substr($1, 1, 1) == "#") { # Skip comments.
     continue
   }
+  if ($NF ~ /^arch=/) {
+    arch=$NF;
+    split(arch, a, "=")
+    if (a[2] != MACH)
+      continue
+    NF--;
+  }
   fmri=$1
   split(fmri, a, "@")
   gsub("/", "---", a[1])
@@ -17,12 +24,21 @@
     continue
   }
   printf "set name=pkg.fmri value=pkg:/%s\n", fmri
+  if ($NF ~ /^incorporate=/) {
+    incorporate=$NF;
+    NF--;
+  }
   if (NF == 2) {
     print "set name=pkg.renamed value=true"
     printf "depend type=require fmri=%s\n", $2
   } else {
     print "set name=pkg.obsolete value=true"
   }
-  print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  if (incorporate) {
+    printf "set name=org.opensolaris.consolidation %s value=$(CONSOLIDATION)\n",
+      incorporate
+  } else {
+    print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  }
   exit 0 # We're done; no point continuing.
 }