diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index e87f1d31b3..e24828450f 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -46,7 +46,7 @@ static const struct passwd nobody_passwd = {
         .pw_passwd = (char*) PASSWORD_LOCKED_AND_INVALID,
         .pw_uid = UID_NOBODY,
         .pw_gid = GID_NOBODY,
-        .pw_gecos = (char*) "User Nobody",
+        .pw_gecos = (char*) "Kernel Overflow User",
         .pw_dir = (char*) "/",
         .pw_shell = (char*) NOLOGIN,
 };
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
index 7f1d052deb..a602b872e4 100644
--- a/sysusers.d/basic.conf.in
+++ b/sysusers.d/basic.conf.in
@@ -10,7 +10,7 @@ u root    0     "Super User" /root
 
 # The nobody user/group for NFS file systems
 g {{NOBODY_GROUP_NAME}} 65534       -            -
-u {{NOBODY_USER_NAME }} 65534:65534 "Nobody"     -
+u {{NOBODY_USER_NAME }} 65534:65534 "Kernel Overflow User"     -
 
 # Administrator group: can *see* more than normal users
 g adm     {{ADM_GID    }}     -            -