diff --git a/libs/libc/wchar/CMakeLists.txt b/libs/libc/wchar/CMakeLists.txt
index 057708b4b9d..8f53373b606 100644
--- a/libs/libc/wchar/CMakeLists.txt
+++ b/libs/libc/wchar/CMakeLists.txt
@@ -63,4 +63,5 @@ target_sources(
           lib_wcsstr.c
           lib_wcstok.c
           lib_wcswcs.c
-          lib_wcwidth.c)
+          lib_wcwidth.c
+          lib_wcswidth.c)
diff --git a/libs/libc/wchar/Make.defs b/libs/libc/wchar/Make.defs
index 9013dc9b953..1ff33ba725b 100644
--- a/libs/libc/wchar/Make.defs
+++ b/libs/libc/wchar/Make.defs
@@ -29,7 +29,7 @@ CSRCS += lib_swprintf.c lib_mbsnrtowcs.c lib_wcsnrtombs.c lib_mbsinit.c
 CSRCS += lib_mbrlen.c lib_mbsrtowcs.c lib_wcsrtombs.c lib_wcscpy.c
 CSRCS += lib_wcscat.c lib_wcslcat.c lib_wcsncat.c lib_wcsrchr.c lib_wcschr.c
 CSRCS += lib_wcsncpy.c lib_wcsncmp.c lib_wcscspn.c lib_wcspbrk.c lib_wcsspn.c
-CSRCS += lib_wcsstr.c lib_wcstok.c lib_wcswcs.c lib_wcwidth.c
+CSRCS += lib_wcsstr.c lib_wcstok.c lib_wcswcs.c lib_wcwidth.c lib_wcswidth.c
 
 # Add the wchar directory to the build
 
diff --git a/libs/libc/wchar/lib_wcswidth.c b/libs/libc/wchar/lib_wcswidth.c
new file mode 100644
index 00000000000..5df340b4c17
--- /dev/null
+++ b/libs/libc/wchar/lib_wcswidth.c
@@ -0,0 +1,62 @@
+/****************************************************************************
+ * libs/libc/wchar/lib_wcswidth.c
+ *
+ * Copyright © 2005-2014 Rich Felker, et al.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <wchar.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  wcswidth
+ *
+ * Description:
+ *    Determine columns needed for a fixed-size wide charcater string
+ *
+ * Input Parameters:
+ *   wcs - the wide character string need to calculate
+ *   n - the length the wide character string
+ *
+ * Returned Value:
+ *   Return the number of columns needed to represent the wide-character
+ *   string pointed by "wcs", but at most "n" wide character. If a
+ *   nonprintable wide character occurs among these characters, -1 is
+ *   returned
+ *
+ ****************************************************************************/
+
+int wcswidth(FAR const wchar_t *wcs, size_t n)
+{
+  int l = 0;
+  int k = 0;
+  for (; n-- && *wcs && (k = wcwidth(*wcs)) >= 0; l += k, wcs++);
+
+  return k < 0 ? k : l;
+}