diff --git a/MODULES.html.sh b/MODULES.html.sh
index 9f89f1d1e3..e7865d51af 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2002-2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2122,12 +2122,22 @@ func_all_modules ()
   func_module unicodeio
   func_module rpmatch
   func_module yesno
+  func_module linebreak
+  func_module bison-i18n
+  func_end_table
+
+  element="Unicode string functions"
+  element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"`
+  func_section_wrap posix_ext_unicode
+  func_wrap H3
+  func_echo "$element"
+
+  func_begin_table
+  func_module unitypes
   func_module ucs4-utf8
   func_module ucs4-utf16
   func_module utf8-ucs4
   func_module utf16-ucs4
-  func_module linebreak
-  func_module bison-i18n
   func_end_table
 
   element="Executing programs"
diff --git a/lib/unitypes.h b/lib/unitypes.h
new file mode 100644
index 0000000000..75502adf25
--- /dev/null
+++ b/lib/unitypes.h
@@ -0,0 +1,28 @@
+/* Elementary types for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _UNITYPES_H
+#define _UNITYPES_H
+
+/* Get uint8_t, uint16_t, uint32_t.  */
+#include <stdint.h>
+
+/* Type representing a Unicode character.  */
+typedef uint32_t ucs4_t;
+
+#endif /* _UNITYPES_H */
diff --git a/modules/unitypes b/modules/unitypes
new file mode 100644
index 0000000000..b924da974c
--- /dev/null
+++ b/modules/unitypes
@@ -0,0 +1,22 @@
+Description:
+Base types for Unicode string functions.
+
+Files:
+lib/unitypes.h
+
+Depends-on:
+stdint
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+"unitypes.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+