diff --git a/lib/roken/k_getpwnam.c b/lib/roken/k_getpwnam.c
index ea17e411e..50201cda2 100644
--- a/lib/roken/k_getpwnam.c
+++ b/lib/roken/k_getpwnam.c
@@ -22,6 +22,7 @@ k_getpwnam (char *user)
 	  spwd = getspnam (user);
 	  if (spwd)
 	       p->pw_passwd = spwd->sp_pwdp;
+	  endspent ();
      }
 #endif
      return p;
diff --git a/lib/roken/k_getpwuid.c b/lib/roken/k_getpwuid.c
index 1e15d9b86..377f5b783 100644
--- a/lib/roken/k_getpwuid.c
+++ b/lib/roken/k_getpwuid.c
@@ -22,6 +22,7 @@ k_getpwuid (uid_t uid)
 	  spwd = getspuid (uid);
 	  if (spwd)
 	       p->pw_passwd = spwd->sp_pwdp;
+	  endspent ();
      }
 #endif
      return p;