new file mode 100644
--- /dev/null
+++ b/lib/unistr/u16-strrchr.c
@@ -0,0 +1,68 @@
+/* Search character in UTF-16 string.
+   Copyright (C) 1999, 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 "unistr.h"
+
+#include "ucs4-utf16.h"
+
+uint16_t *
+u16_strrchr (const uint16_t *s, ucs4_t uc)
+{
+  /* Calling u16_strlen and then searching from the other end would cause more
+     memory accesses. Avoid that, at the cost of a few more comparisons.  */
+  uint16_t *result = NULL;
+  uint16_t c[2];
+
+  if (uc < 0x10000)
+    {
+      uint16_t c0 = uc;
+
+      for (;; s++)
+	{
+	  if (*s == c0)
+	    result = (uint16_t *) s;
+	  if (*s == 0)
+	    break;
+	}
+    }
+  else
+    switch (u16_uctomb_aux (c, uc, 2))
+      {
+      case 2:
+	if (*s)
+	  {
+	    uint16_t c0 = c[0];
+	    uint16_t c1 = c[1];
+
+	    /* FIXME: Maybe walking the string via u16_mblen is a win?  */
+	    for (;; s++)
+	      {
+		if (s[1] == 0)
+		  break;
+		if (*s == c0 && s[1] == c1)
+		  result = (uint16_t *) s;
+	      }
+	  }
+	break;
+      }
+  return result;
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u32-strrchr.c
@@ -0,0 +1,40 @@
+/* Search character in UTF-32 string.
+   Copyright (C) 1999, 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 "unistr.h"
+
+uint32_t *
+u32_strrchr (const uint32_t *s, ucs4_t uc)
+{
+  /* Calling u32_strlen and then searching from the other end would cause more
+     memory accesses. Avoid that, at the cost of a few more comparisons.  */
+  uint32_t *result = NULL;
+
+  for (;; s++)
+    {
+      if (*s == uc)
+	result = (uint32_t *) s;
+      if (*s == 0)
+	break;
+    }
+  return result;
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u8-strrchr.c
@@ -0,0 +1,105 @@
+/* Search character in UTF-8 string.
+   Copyright (C) 1999, 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 "unistr.h"
+
+#include "ucs4-utf8.h"
+
+uint8_t *
+u8_strrchr (const uint8_t *s, ucs4_t uc)
+{
+  /* Calling u8_strlen and then searching from the other end would cause more
+     memory accesses. Avoid that, at the cost of a few more comparisons.  */
+  uint8_t *result = NULL;
+  uint8_t c[6];
+
+  if (uc < 0x80)
+    {
+      uint8_t c0 = uc;
+
+      for (;; s++)
+	{
+	  if (*s == c0)
+	    result = (uint8_t *) s;
+	  if (*s == 0)
+	    break;
+	}
+    }
+  else
+    switch (u8_uctomb_aux (c, uc, 6))
+      {
+      case 2:
+	if (*s)
+	  {
+	    uint8_t c0 = c[0];
+	    uint8_t c1 = c[1];
+
+	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+	    for (;; s++)
+	      {
+		if (s[1] == 0)
+		  break;
+		if (*s == c0 && s[1] == c1)
+		  result = (uint8_t *) s;
+	      }
+	  }
+	break;
+
+      case 3:
+	if (*s && s[1])
+	  {
+	    uint8_t c0 = c[0];
+	    uint8_t c1 = c[1];
+	    uint8_t c2 = c[2];
+
+	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+	    for (;; s++)
+	      {
+		if (s[2] == 0)
+		  break;
+		if (*s == c0 && s[1] == c1 && s[2] == c2)
+		  result = (uint8_t *) s;
+	      }
+	  }
+	break;
+
+      case 4:
+	if (*s && s[1] && s[2])
+	  {
+	    uint8_t c0 = c[0];
+	    uint8_t c1 = c[1];
+	    uint8_t c2 = c[2];
+	    uint8_t c3 = c[3];
+
+	    /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+	    for (;; s++)
+	      {
+		if (s[3] == 0)
+		  break;
+		if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
+		  result = (uint8_t *) s;
+	      }
+	  }
+	break;
+      }
+  return result;
+}

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u16-strrchr
@@ -0,0 +1,24 @@
+Description:
+Search character in UTF-16 string.
+
+Files:
+lib/unistr/u16-strrchr.c
+
+Depends-on:
+unistr/base
+ucs4-utf16
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u16-strrchr.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u32-strrchr
@@ -0,0 +1,23 @@
+Description:
+Search character in UTF-32 string.
+
+Files:
+lib/unistr/u32-strrchr.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u32-strrchr.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u8-strrchr
@@ -0,0 +1,24 @@
+Description:
+Search character in UTF-8 string.
+
+Files:
+lib/unistr/u8-strrchr.c
+
+Depends-on:
+unistr/base
+ucs4-utf8
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u8-strrchr.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+