--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-07  Bruno Haible  <bruno@clisp.org>
 
+	* lib/uniwidth/u16-strwidth.c: New file.
+	* modules/uniwidth/u16-strwidth: New file.
+
 	* tests/uniwidth/test-u8-strwidth.c: New file.
 	* modules/uniwidth/u8-strwidth-tests: New file.
 

new file mode 100644
--- /dev/null
+++ b/lib/uniwidth/u16-strwidth.c
@@ -0,0 +1,31 @@
+/* Determine display width of UTF-16 string.
+   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   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.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "uniwidth.h"
+
+#include "unistr.h"
+
+int
+u16_strwidth (const uint16_t *s, const char *encoding)
+{
+  return u16_width (s, u16_strlen (s), encoding);
+}

new file mode 100644
--- /dev/null
+++ b/modules/uniwidth/u16-strwidth
@@ -0,0 +1,25 @@
+Description:
+Determine display width of UTF-16 string.
+
+Files:
+lib/uniwidth/u16-strwidth.c
+
+Depends-on:
+uniwidth/base
+uniwidth/u16-width
+unistr/u16-strlen
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += uniwidth/u16-strwidth.c
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+