diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 66f5255e2a..e4185e020f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,7 +1,12 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
-	* Versions: Add pthread_mutex_consistent for GLIBC_2.12.
+	* Versions: Add pthread_mutex_consistent, pthread_mutexattr_getrobust,
+	and pthread_mutexattr_setrobust for GLIBC_2.12.
 	* pthread_mutex_consistent.c: Define alias pthread_mutex_consistent.
+	* pthread_mutexattr_getrobust.c: Define alias
+	pthread_mutexattr_getrobust.
+	* pthread_mutexattr_setrobust.c: Define alias
+	pthread_mutexattr_setrobust.
 
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nptl/Versions b/nptl/Versions
index dcdd5eb3be..1f2de79fd4 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -245,7 +245,8 @@ libpthread {
   };
 
   GLIBC_2.12 {
-    pthread_mutex_consistent;
+    pthread_mutex_consistent; pthread_mutexattr_getrobust;
+    pthread_mutexattr_setrobust;
   };
 
   GLIBC_PRIVATE {
diff --git a/nptl/pthread_mutexattr_getrobust.c b/nptl/pthread_mutexattr_getrobust.c
index 5ec43d1f7c..9e61bb0f06 100644
--- a/nptl/pthread_mutexattr_getrobust.c
+++ b/nptl/pthread_mutexattr_getrobust.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -21,7 +21,7 @@
 
 
 int
-pthread_mutexattr_getrobust_np (attr, robustness)
+pthread_mutexattr_getrobust (attr, robustness)
      const pthread_mutexattr_t *attr;
      int *robustness;
 {
@@ -34,3 +34,4 @@ pthread_mutexattr_getrobust_np (attr, robustness)
 
   return 0;
 }
+weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np)
diff --git a/nptl/pthread_mutexattr_setrobust.c b/nptl/pthread_mutexattr_setrobust.c
index cf95e35b6f..df51ef53b0 100644
--- a/nptl/pthread_mutexattr_setrobust.c
+++ b/nptl/pthread_mutexattr_setrobust.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -22,7 +22,7 @@
 
 
 int
-pthread_mutexattr_setrobust_np (attr, robustness)
+pthread_mutexattr_setrobust (attr, robustness)
      pthread_mutexattr_t *attr;
      int robustness;
 {
@@ -41,3 +41,4 @@ pthread_mutexattr_setrobust_np (attr, robustness)
 
   return 0;
 }
+weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np)