diff --git a/doc/tools/cardos-tool.xml b/doc/tools/cardos-tool.xml
index 3b11a11eb..033566255 100644
--- a/doc/tools/cardos-tool.xml
+++ b/doc/tools/cardos-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>cardos-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/cryptoflex-tool.xml b/doc/tools/cryptoflex-tool.xml
index 798140d10..39d8b0fbe 100644
--- a/doc/tools/cryptoflex-tool.xml
+++ b/doc/tools/cryptoflex-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>cryptoflex-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/eidenv.xml b/doc/tools/eidenv.xml
index aedebb16a..4cdf28bcd 100644
--- a/doc/tools/eidenv.xml
+++ b/doc/tools/eidenv.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>eidenv</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/netkey-tool.xml b/doc/tools/netkey-tool.xml
index 6f413ce18..3cc295933 100644
--- a/doc/tools/netkey-tool.xml
+++ b/doc/tools/netkey-tool.xml
@@ -3,7 +3,9 @@
   <refmeta>
     <refentrytitle>netkey-tool</refentrytitle>
     <manvolnum>1</manvolnum>
-    <refmiscinfo>opensc</refmiscinfo>
+    <refmiscinfo class="productname">OpenSC</refmiscinfo>
+    <refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+    <refmiscinfo class="source">opensc</refmiscinfo>
   </refmeta>
 
   <refnamediv>
diff --git a/doc/tools/opensc-explorer.xml b/doc/tools/opensc-explorer.xml
index 7052af12c..1a477e1aa 100644
--- a/doc/tools/opensc-explorer.xml
+++ b/doc/tools/opensc-explorer.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>opensc-explorer</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/opensc-tool.xml b/doc/tools/opensc-tool.xml
index 3aae6eac4..6a9dc59c6 100644
--- a/doc/tools/opensc-tool.xml
+++ b/doc/tools/opensc-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>opensc-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/piv-tool.xml b/doc/tools/piv-tool.xml
index 0a86692a1..fc1005b81 100644
--- a/doc/tools/piv-tool.xml
+++ b/doc/tools/piv-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>piv-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/pkcs11-tool.xml b/doc/tools/pkcs11-tool.xml
index 342a3c0db..dff94ff9b 100644
--- a/doc/tools/pkcs11-tool.xml
+++ b/doc/tools/pkcs11-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>pkcs11-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/pkcs15-crypt.xml b/doc/tools/pkcs15-crypt.xml
index 794443e8c..0927e274e 100644
--- a/doc/tools/pkcs15-crypt.xml
+++ b/doc/tools/pkcs15-crypt.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>pkcs15-crypt</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/pkcs15-init.xml b/doc/tools/pkcs15-init.xml
index 5a410e763..72ef44c02 100644
--- a/doc/tools/pkcs15-init.xml
+++ b/doc/tools/pkcs15-init.xml
@@ -3,13 +3,17 @@
 	<refmeta>
 		<refentrytitle>pkcs15-init</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refmeta>
 		<refentrytitle>pkcs15-init</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/pkcs15-profile.xml b/doc/tools/pkcs15-profile.xml
index dfbea8641..e66ea7725 100644
--- a/doc/tools/pkcs15-profile.xml
+++ b/doc/tools/pkcs15-profile.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>pkcs15-profile</refentrytitle>
 		<manvolnum>5</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC File Formats</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/pkcs15-tool.xml b/doc/tools/pkcs15-tool.xml
index dd5272278..24176e3cd 100644
--- a/doc/tools/pkcs15-tool.xml
+++ b/doc/tools/pkcs15-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>pkcs15-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>
diff --git a/doc/tools/westcos-tool.xml b/doc/tools/westcos-tool.xml
index e4d0049d7..139e5ed32 100644
--- a/doc/tools/westcos-tool.xml
+++ b/doc/tools/westcos-tool.xml
@@ -3,7 +3,9 @@
 	<refmeta>
 		<refentrytitle>westcos-tool</refentrytitle>
 		<manvolnum>1</manvolnum>
-		<refmiscinfo>opensc</refmiscinfo>
+		<refmiscinfo class="productname">OpenSC</refmiscinfo>
+		<refmiscinfo class="manual">OpenSC Tools</refmiscinfo>
+		<refmiscinfo class="source">opensc</refmiscinfo>
 	</refmeta>
 
 	<refnamediv>