diff --git a/ChangeLog b/ChangeLog
index 310d9a7c11..77b9972029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-07-26  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* time/Versions: Add POSIX.1b timer and clock functions to GLIBC_2.2.
+
 1999-07-25  Jakub Jelinek  <jj@ultra.linux.cz>
 
 	* elf/link.h (struct link_map): Use Elf_Symndx instead of ElfXX_Symndx.
diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 7718b54aaf..24fd2f93fb 100755
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -f
 #
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library and contains tests for
 # the rpmatch(3)-implementation.
 # contributed by Jochen Hein <jochen.hein@delphi.central.de>
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 common_objpfx=$1
-IFS="§"
+IFS="&"
 rc=0
 while read locale string result dummy; do
     if [ "$locale" != "#" ]; then
@@ -30,31 +30,31 @@ while read locale string result dummy; do
 	|| exit 1
     fi
 done <<EOF
-#§ These are the tests for rpmatch in glibc.  Each line contains one test,
-#§ comments start with #§ in the first column.  The fields are seperated
-#§ by paragraph signs and contain: the locale, the string, the expected
-#§ return value of rpmatch(3).  If the test fails, test-rpmatch prints
-#§ all these informations
-C§Yes§1
-C§yes§1
-C§YES§1
-C§YeS§1
-C§YEs§1
-C§yEs§1
-C§yES§1
-C§yeS§1
-C§No§0
-C§no§0
-#§ Uh, that's nonsense
-C§nonsens§0
-C§Error§-1
-de_DE§Yes§1
-de_DE§Ja§1
-de_DE§Jammerschade§1
-de_DE§dejavu§-1
-de_DE§Nein§0
-de_DE§Fehler§-1
-de_DE§jein§1
+#& These are the tests for rpmatch in glibc.  Each line contains one test,
+#& comments start with #& in the first column.  The fields are seperated
+#& by paragraph signs and contain: the locale, the string, the expected
+#& return value of rpmatch(3).  If the test fails, test-rpmatch prints
+#& all these informations
+C&Yes&1
+C&yes&1
+C&YES&1
+C&YeS&1
+C&YEs&1
+C&yEs&1
+C&yES&1
+C&yeS&1
+C&No&0
+C&no&0
+#& Uh, that's nonsense
+C&nonsens&0
+C&Error&-1
+de_DE&Yes&1
+de_DE&Ja&1
+de_DE&Jammerschade&1
+de_DE&dejavu&-1
+de_DE&Nein&0
+de_DE&Fehler&-1
+de_DE&jein&1
 EOF
 
 rc=$?
diff --git a/time/Versions b/time/Versions
index ed6429edec..4f713a9926 100644
--- a/time/Versions
+++ b/time/Versions
@@ -47,6 +47,13 @@ libc {
     getdate; getdate_r; getitimer;
   }
   GLIBC_2.2 {
+    # c*
+    clock_getres; clock_gettime; clock_settime;
+
+    # t*
+    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    timer_settime;
+
     # w*
     wcsftime;
   }