diff --git a/ChangeLog b/ChangeLog
index df25901c6c..d9a97f0637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-17  Andreas Jaeger  <aj@suse.de>
+
+	* time/Versions: Sort entries.
+	* string/Versions: Likewise.
+	* resolv/Versions: Likewise.
+	* posix/Versions: Likewise.
+	* iconv/Versions: Likewise.
+	* elf/Versions: Likewise.
+	* wcsmbs/Versions: Likewise.
+
 2013-02-15  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/ieee754/dbl-64/mpa.c (__sqr): Avoid using LIM in
diff --git a/elf/Versions b/elf/Versions
index 87e27c5a7a..d6b5e5034d 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -1,7 +1,7 @@
 libc {
   GLIBC_2.0 {
 %ifdef EXPORT_UNWIND_FIND_FDE
-    __register_frame_info; __deregister_frame_info;
+    __deregister_frame_info; __register_frame_info;
 %endif
   }
   GLIBC_2.1 {
@@ -13,23 +13,23 @@ libc {
   }
 %ifdef EXPORT_UNWIND_FIND_FDE
   GCC_3.0 {
-    __register_frame_info_bases; __deregister_frame_info_bases;
+    __deregister_frame_info_bases; __register_frame_info_bases;
     __register_frame_info_table_bases; _Unwind_Find_FDE;
   }
 %endif
   GLIBC_PRIVATE {
     # functions used in other libraries
     _dl_addr;
-    _dl_sym; _dl_vsym;
     _dl_open_hook;
-    __libc_dlopen_mode; __libc_dlsym; __libc_dlclose;
+    _dl_sym; _dl_vsym;
+    __libc_dlclose; __libc_dlopen_mode; __libc_dlsym;
   }
 }
 
 ld {
   GLIBC_2.0 {
     # Function from libc.so which must be shared with libc.
-    calloc; free; malloc; realloc; __libc_memalign;
+    __libc_memalign; calloc; free; malloc; realloc;
 
     _r_debug;
   }
@@ -50,16 +50,15 @@ ld {
   GLIBC_PRIVATE {
     # Those are in the dynamic linker, but used by libc.so.
     __libc_enable_secure;
-    _dl_argv;
-    _dl_out_of_memory;
-    _dl_starting_up;
+    _dl_allocate_tls; _dl_allocate_tls_init;
+    _dl_argv; _dl_get_tls_static_info; _dl_deallocate_tls;
+    _dl_make_stack_executable; _dl_out_of_memory;
+    _dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup;
     _rtld_global; _rtld_global_ro;
-    _dl_allocate_tls; _dl_deallocate_tls;
-    _dl_get_tls_static_info; _dl_allocate_tls_init;
-    _dl_tls_setup; _dl_rtld_di_serinfo;
-    _dl_make_stack_executable;
+
     # Only here for gdb while a better method is developed.
     _dl_debug_state;
+
     # Pointer protection.
     __pointer_chk_guard;
   }
diff --git a/iconv/Versions b/iconv/Versions
index 7f09ed49c4..5d50cf11e2 100644
--- a/iconv/Versions
+++ b/iconv/Versions
@@ -1,10 +1,10 @@
 libc {
   GLIBC_2.1 {
     # i*
-    iconv_open; iconv; iconv_close;
+    iconv; iconv_open; iconv_close;
   }
   GLIBC_PRIVATE {
     # functions shared with iconv program
-    __gconv_get_alias_db; __gconv_get_modules_db; __gconv_get_cache;
+    __gconv_get_alias_db; __gconv_get_cache; __gconv_get_modules_db;
   }
 }
diff --git a/posix/Versions b/posix/Versions
index 686c446bcd..1bc235acd2 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -1,7 +1,7 @@
 libc {
   GLIBC_2.0 {
     # functions with special/multiple interfaces
-    __bsd_getpgrp; __setpgid; __getpgid;
+    __bsd_getpgrp; __getpgid; __setpgid;
 
     # functions with required interface outside normal name space
     _exit;
@@ -114,7 +114,7 @@ libc {
     # under GLIBC_2.0; the first instance in the script is taken as the
     # default, so linux configurations put them in GLIBC_2.0 while other
     # configuration put them in GLIBC_2.3.2.
-    getresuid; getresgid; setresuid; setresgid;
+    getresgid; getresuid; setresgid; setresuid;
   }
   GLIBC_2.3.3 {
     sched_getaffinity; sched_setaffinity;
diff --git a/resolv/Versions b/resolv/Versions
index 93faf1e2f5..6f02597372 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -97,6 +97,6 @@ libnss_dns {
 
 libanl {
   GLIBC_2.2.3 {
-    getaddrinfo_a; gai_cancel; gai_error; gai_suspend;
+    gai_cancel; gai_error; gai_suspend; getaddrinfo_a;
   }
 }
diff --git a/string/Versions b/string/Versions
index f145fd34a4..59bf35a3bd 100644
--- a/string/Versions
+++ b/string/Versions
@@ -7,8 +7,8 @@ libc {
     __bzero; __strtok_r;
 
     # functions used in other libraries
-    __stpncpy; __stpcpy; __strdup; __mempcpy; __strcasecmp; __strerror_r;
-    __ffs;
+    __ffs; __mempcpy; __stpncpy; __stpcpy; __strcasecmp; __strdup;
+    __strerror_r;
 
     # a*
     argz_add; argz_add_sep; argz_append; argz_count; argz_create;
diff --git a/time/Versions b/time/Versions
index a7c263008c..fd838181e4 100644
--- a/time/Versions
+++ b/time/Versions
@@ -1,7 +1,7 @@
 libc {
   GLIBC_2.0 {
     # global variables
-    __timezone; __daylight; __tzname;
+    __daylight; __timezone; __tzname;
 
     # functions with special/multiple interfaces
     __adjtimex;
@@ -51,13 +51,13 @@ libc {
     wcsftime;
   }
   GLIBC_2.3 {
+    # these internal names are used by libstdc++
+    __strftime_l; __wcsftime_l;
+
     # s*
     strftime_l;
     # w*
     wcsftime_l;
-
-    # these internal names are used by libstdc++
-    __strftime_l; __wcsftime_l;
   }
   GLIBC_2.3.2 {
     strptime_l;
diff --git a/wcsmbs/Versions b/wcsmbs/Versions
index 10bccc9539..1ff5ff3057 100644
--- a/wcsmbs/Versions
+++ b/wcsmbs/Versions
@@ -1,7 +1,7 @@
 libc {
   GLIBC_2.0 {
     # functions used in inline functions or macros
-    __wcsto*_internal; __mbrlen; __mbrtowc;
+     __mbrlen; __mbrtowc; __wcsto*_internal;
 
     # b*
     btowc;
@@ -25,10 +25,10 @@ libc {
     wcschrnul; wmempcpy;
   }
   GLIBC_2.7 {
-    __isoc99_wscanf; __isoc99_vwscanf; __isoc99_fwscanf; __isoc99_vfwscanf;
-    __isoc99_swscanf; __isoc99_vswscanf;
+    __isoc99_fwscanf; __isoc99_swscanf; __isoc99_vfwscanf; __isoc99_vswscanf;
+    __isoc99_vwscanf; __isoc99_wscanf;
   }
   GLIBC_2.16 {
-    mbrtoc16; c16rtomb; mbrtoc32; c32rtomb;
+    c16rtomb; c32rtomb; mbrtoc16; mbrtoc32;
   }
 }