diff --git a/src/doc/doc/about/about_libraries.xml b/src/doc/doc/about/about_libraries.xml
index 86debab30..70ee02d31 100644
--- a/src/doc/doc/about/about_libraries.xml
+++ b/src/doc/doc/about/about_libraries.xml
@@ -4,8 +4,8 @@
 <doc>
 
   <title>About Libraries</title>
-  <keyword>Library</keyword>
-  <keyword>Libraries</keyword>
+  <keyword name="Library"/>
+  <keyword name="Libraries"/>
 
   <p>
   Starting with version 0.22, KLayout offers a library concept. 
diff --git a/src/doc/doc/about/about_pcells.xml b/src/doc/doc/about/about_pcells.xml
index 8453f32d8..292d757cb 100644
--- a/src/doc/doc/about/about_pcells.xml
+++ b/src/doc/doc/about/about_pcells.xml
@@ -4,6 +4,7 @@
 <doc>
 
   <title>About PCells</title>
+  <keyword name="PCells"/>
 
   <p>
   Starting with version 0.22, KLayout offers parametrized cells (PCells).
diff --git a/src/doc/doc/about/basic_lib.xml b/src/doc/doc/about/basic_lib.xml
index 3fa5c1715..5689306cc 100644
--- a/src/doc/doc/about/basic_lib.xml
+++ b/src/doc/doc/about/basic_lib.xml
@@ -4,6 +4,7 @@
 <doc>
 
   <title>About The Basic Library</title>
+  <keyword name="Basic Library"/>
 
   <h2-index/>
 
diff --git a/src/doc/doc/about/connectivity.xml b/src/doc/doc/about/connectivity.xml
index 1118c2211..e2f8f51c6 100644
--- a/src/doc/doc/about/connectivity.xml
+++ b/src/doc/doc/about/connectivity.xml
@@ -4,6 +4,7 @@
 <doc>
 
   <title>Connectivity</title>
+  <keyword name="Connectivity"/>
 
   <p>
   Use the connectivity page to specify the conductor layers and their connections.
diff --git a/src/doc/doc/about/expressions.xml b/src/doc/doc/about/expressions.xml
index d7f83622f..4f350f1b0 100644
--- a/src/doc/doc/about/expressions.xml
+++ b/src/doc/doc/about/expressions.xml
@@ -4,8 +4,8 @@
 <doc>
 
   <title>About Expressions</title>
-  <keyword>Expressions</keyword>
-  <keyword>Expression Syntax</keyword>
+  <keyword name="Expressions"/>
+  <keyword name="Expression Syntax"/>
 
   <p>
   Beside a ruby and Python programming API, KLayout provides support for simple expressions in some places.