diff --git a/include/string.h b/include/string.h
index ef331bd9d8d..2b725a7e59d 100644
--- a/include/string.h
+++ b/include/string.h
@@ -74,6 +74,7 @@ FAR char  *strncpy(FAR char *, FAR const char *, size_t);
 FAR char  *stpncpy(FAR char *, FAR const char *, size_t);
 FAR char  *strpbrk(FAR const char *, FAR const char *);
 FAR char  *strchr(FAR const char *s, int c);
+FAR char  *strchrnul(FAR const char *s, int c);
 FAR char  *strrchr(FAR const char *s, int c);
 size_t     strspn(FAR const char *, FAR const char *);
 size_t     strcspn(FAR const char *, FAR const char *);
diff --git a/libs/libc/string/Make.defs b/libs/libc/string/Make.defs
index 3b4f1f795cb..04b588adc66 100644
--- a/libs/libc/string/Make.defs
+++ b/libs/libc/string/Make.defs
@@ -24,8 +24,8 @@ CSRCS += lib_ffs.c lib_ffsl.c lib_ffsll.c lib_fls.c lib_flsl.c
 CSRCS += lib_flsll.c lib_isbasedigit.c lib_memccpy.c lib_memrchr.c
 CSRCS += lib_popcount.c lib_popcountl.c lib_popcountll.c
 CSRCS += lib_skipspace.c lib_stpcpy.c lib_stpncpy.c lib_strcasecmp.c
-CSRCS += lib_strcat.c lib_strcspn.c lib_strdup.c lib_strerror.c
-CSRCS += lib_strncasecmp.c lib_strncat.c lib_strncmp.c
+CSRCS += lib_strcat.c lib_strcspn.c lib_strchrnul.c lib_strdup.c
+CSRCS += lib_strerror.c lib_strncasecmp.c lib_strncat.c lib_strncmp.c
 CSRCS += lib_strndup.c lib_strcasestr.c lib_strpbrk.c lib_strrchr.c
 CSRCS += lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c
 CSRCS += lib_strsep.c lib_strerrorr.c lib_explicit_bzero.c lib_strsignal.c
diff --git a/libs/libc/string/lib_strchrnul.c b/libs/libc/string/lib_strchrnul.c
new file mode 100644
index 00000000000..ab15fb96004
--- /dev/null
+++ b/libs/libc/string/lib_strchrnul.c
@@ -0,0 +1,58 @@
+/****************************************************************************
+ * libs/libc/string/lib_strchrnul.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <string.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: strchrnul
+ *
+ * Description:
+ *   The strchrnul() function locates the first occurrence of 'c' (converted
+ *   to a char) in the string pointed to by 's'. The terminating null byte is
+ *   considered to be part of the string.
+ *
+ * Returned Value:
+ *   Upon completion, strchrnull() returns a pointer to the byte, or a
+ *   pointer to null if the byte was not found.
+ *
+ ****************************************************************************/
+
+FAR char *strchrnul(FAR const char *s, int c)
+{
+  if (s)
+    {
+      while (*s && *s != c)
+        {
+          s++;
+        }
+    }
+
+  return (FAR char *)s;
+}