diff --git a/Misc/NEWS b/Misc/NEWS
index a322b3d..6694234 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Issue #9605: posix.getlogin() decodes the username with file filesystem
+  encoding and surrogateescape error handler. Patch written by David Watson.
+
 - Issue #9604: posix.initgroups() encodes the username using the fileystem
   encoding and surrogateescape error handler. Patch written by David Watson.
 
@@ -317,7 +320,7 @@
   Fix a crash if an empty directory called "encodings" exists in sys.path.
 
 - Issue #8589: Decode PYTHONWARNINGS environment variable with the file system
-  encoding and surrogateespace error handler instead of the locale encoding to
+  encoding and surrogateescape error handler instead of the locale encoding to
   be consistent with os.environ.  Add PySys_AddWarnOptionUnicode() function.
 
 - PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 7151289..73fab71 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4354,13 +4354,12 @@
     name = getlogin();
     if (name == NULL) {
         if (errno)
-        posix_error();
+            posix_error();
         else
-        PyErr_SetString(PyExc_OSError,
-                        "unable to determine login name");
+            PyErr_SetString(PyExc_OSError, "unable to determine login name");
     }
     else
-        result = PyUnicode_FromString(name);
+        result = PyUnicode_DecodeFSDefault(name);
     errno = old_errno;
 
     return result;