diff --git a/ChangeLog b/ChangeLog
index fffe816c04..e16ef0a4e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-22  Jan-Benedict Glaw  <jbglaw@getslash.de>
+
+	* nss/getent.c (shadow_keys): Call endspent, not endpwent.
+
 2013-04-22  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/posix/getaddrinfo.c (getaddrinfo): Compute results
diff --git a/nss/getent.c b/nss/getent.c
index aa4eaf9e0d..8a3c864501 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -841,7 +841,7 @@ shadow_keys (int number, char *key[])
       setspent ();
       while ((sp = getspent ()) != NULL)
 	print_shadow (sp);
-      endpwent ();
+      endspent ();
       return result;
     }