diff --git a/build/check_embedded.pl b/build/check_embedded.pl
index a0515531..3fe5485e 100755
--- a/build/check_embedded.pl
+++ b/build/check_embedded.pl
@@ -143,6 +143,13 @@ sub comment {
 		@args = split;
 		$entity = $args[1];
 		$keyname = $args[3];
+
+		#
+		# Tidy entity ID if it includes a UK ID as well.
+		#
+		if ($entity =~ /^\[(.+)\](.+)$/) {
+			$entity = $2 . ' (' . $1 . ')';
+		}
 		
 		#
 		# Output header line.
@@ -439,6 +446,14 @@ sub comment {
 		#
 		close $fh;
 
+		#if ($issuer eq $subject) {
+		#	# self-signed
+		#} elsif ($issuerCN eq 'TERENA SSL CA') {
+		#	# this one we know about
+		#} else {
+		#	warning("issuer is '$issuerCN'");
+		#}
+
 		#
 		# Add a warning for certain issuers.
 		#