diff --git a/docs/reference/eek/Makefile.am b/docs/reference/eek/Makefile.am
index ea54c2e5..6fcdcee0 100644
--- a/docs/reference/eek/Makefile.am
+++ b/docs/reference/eek/Makefile.am
@@ -76,13 +76,7 @@ EXTRA_HFILES=
 
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= eek-private.h \
-	eek-drawing.h \
-	eek-clutter-key.h \
-	eek-clutter-section.h \
-	eek-clutter-key-actor.h \
-	eek-clutter-drawing-context.h \
-	config.h
+IGNORE_HFILES=config.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/docs/reference/eek/eek-sections.txt b/docs/reference/eek/eek-sections.txt
index 32f81cbe..db993420 100644
--- a/docs/reference/eek/eek-sections.txt
+++ b/docs/reference/eek/eek-sections.txt
@@ -5,8 +5,8 @@ EekKeyboardClass
 EekKeyboard
 eek_keyboard_new
 eek_keyboard_get_layout
-eek_keyboard_set_keysym_index
-eek_keyboard_get_keysym_index
+eek_keyboard_set_symbol_index
+eek_keyboard_get_symbol_index
 eek_keyboard_get_group
 eek_keyboard_get_level
 eek_keyboard_set_group
@@ -37,7 +37,8 @@ EEK_LAYOUT
 EEK_IS_LAYOUT
 EEK_TYPE_LAYOUT
 eek_layout_get_type
-EEK_LAYOUT_GET_IFACE
+EEK_LAYOUT_CLASS
+EEK_LAYOUT_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -189,10 +190,11 @@ EekKeyClass
 EekKey
 eek_key_set_keycode
 eek_key_get_keycode
-eek_key_set_keysyms
-eek_key_get_keysyms
-eek_key_get_keysym
-eek_key_get_keysym_at_index
+eek_key_set_symbol_matrix
+eek_key_get_symbol_matrix
+eek_key_get_symbol
+eek_key_get_symbol_at_index
+eek_key_get_symbol_with_fallback
 eek_key_set_index
 eek_key_get_index
 eek_key_set_outline
@@ -230,13 +232,44 @@ EEK_IS_ELEMENT_CLASS
 EEK_ELEMENT_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>eek-symbol</FILE>
+<TITLE>EekSymbol</TITLE>
+EekSymbolClass
+EekSymbol
+eek_symbol_new
+eek_symbol_set_name
+eek_symbol_get_name
+eek_symbol_set_label
+eek_symbol_get_label
+eek_symbol_set_category
+eek_symbol_get_category
+eek_symbol_set_modifier_mask
+eek_symbol_get_modifier_mask
+eek_symbol_is_modifier
+<SUBSECTION Standard>
+EEK_SYMBOL
+EEK_IS_SYMBOL
+EEK_TYPE_SYMBOL
+eek_symbol_get_type
+EEK_SYMBOL_CLASS
+EEK_IS_SYMBOL_CLASS
+EEK_SYMBOL_GET_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>eek-types</FILE>
 <TITLE>Basic Types</TITLE>
 EekOrientation
-EekKeysymMatrix
-EEK_TYPE_KEYSYM_MATRIX
-eek_keysym_matrix_get_type
+EekModifierBehavior
+EekModifierType
+EekSymbolMatrix
+EekSymbolCategory
+EEK_TYPE_SYMBOL_MATRIX
+eek_symbol_matrix_copy
+eek_symbol_matrix_free
+eek_symbol_matrix_get_type
+eek_symbol_matrix_new
 EekPoint
 EEK_TYPE_POINT
 eek_point_get_type
@@ -256,14 +289,20 @@ eek_color_new
 
 <SECTION>
 <FILE>eek-keysym</FILE>
-<TITLE>Keysym Utility</TITLE>
+<TITLE>EekKeysym</TITLE>
+EekKeysymClass
+EekKeysym
 EEK_INVALID_KEYSYM
 EEK_INVALID_KEYCODE
-EekKeysymCategory
-eek_keysym_to_string
-eek_keysym_get_category
-eek_keysym_is_modifier
-eek_keysym_to_modifier
-EekModifierBehavior
-EekModifierType
+eek_keysym_get_xkeysym
+eek_keysym_new
+eek_keysym_new_from_name
+<SUBSECTION Standard>
+EEK_KEYSYM
+EEK_IS_KEYSYM
+EEK_TYPE_KEYSYM
+eek_keysym_get_type
+EEK_KEYSYM_CLASS
+EEK_IS_KEYSYM_CLASS
+EEK_KEYSYM_GET_CLASS
 </SECTION>
diff --git a/eek/eek-key.c b/eek/eek-key.c
index b3e6361b..92f20fb6 100644
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@@ -393,7 +393,9 @@ eek_key_init (EekKey *self)
  * @key: an #EekKey
  * @keycode: keycode
  *
- * Set keycode of @key to @keycode.
+ * Set the keycode of @key to @keycode.  The keycode values are
+ * identical to the X keycode name, if the keyboard is built with
+ * #EekXkbLayout or #EekXklLayout.
  */
 void
 eek_key_set_keycode (EekKey *key,
@@ -422,7 +424,7 @@ eek_key_get_keycode (EekKey *key)
  * @key: an #EekKey
  * @matrix: an #EekSymbolMatrix
  *
- * Set the symbol matrix @matrix to @key.
+ * Set the symbol matrix of @key to @matrix.
  */
 void
 eek_key_set_symbol_matrix (EekKey          *key,