diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index 96a3fddecdf9..044689d856b2 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -60,3 +62,19 @@ getlogin()
 	}
 	return (*logname ? logname : (char *)NULL);
 }
+
+
+char *
+getlogin_r(char *logname, int namelen)
+{
+	if (_logname_valid == 0) {
+#ifdef __NETBSD_SYSCALLS
+		if (__getlogin(logname, namelen - 1) < 0)
+#else
+		if (_getlogin(logname, namelen) < 0)
+#endif
+			return ((char *)NULL);
+		_logname_valid = 1;
+	}
+	return (*logname ? logname : (char *)NULL);
+}