diff --git a/Lib/inspect.py b/Lib/inspect.py
index 8b7840a1a0e..b85fbcca6d8 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1827,9 +1827,16 @@ def p(name_node, default_node, default=empty):
         p(f.args.kwarg, empty)
 
     if self_parameter is not None:
+        # Possibly strip the bound argument:
+        #    - We *always* strip first bound argument if
+        #      it is a module.
+        #    - We don't strip first bound argument if
+        #      skip_bound_arg is False.
         assert parameters
-        if getattr(obj, '__self__', None) and skip_bound_arg:
-            # strip off self, it's already been bound
+        _self = getattr(obj, '__self__', None)
+        self_isbound = _self is not None
+        self_ismodule = ismodule(_self)
+        if self_isbound and (self_ismodule or skip_bound_arg):
             parameters.pop(0)
         else:
             # for builtins, self parameter is always positional-only!
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 711d2a3a6ba..95c1b324fb6 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -643,6 +643,13 @@ def test_getfullargspec_builtin_methods(self):
         self.assertFullArgSpecEquals(_pickle.Pickler(io.BytesIO()).dump,
                                      args_e=['self', 'obj'], formatted='(self, obj)')
 
+        self.assertFullArgSpecEquals(
+             os.stat,
+             args_e=['path'],
+             kwonlyargs_e=['dir_fd', 'follow_symlinks'],
+             kwonlydefaults_e={'dir_fd': None, 'follow_symlinks': True},
+             formatted='(path, *, dir_fd=None, follow_symlinks=True)')
+
     @cpython_only
     @unittest.skipIf(MISSING_C_DOCSTRINGS,
                      "Signature information for builtins requires docstrings")