diff --git a/CHANGES b/CHANGES
index 2da6c384b..bbf036276 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,8 @@ Bugs fixed
 ----------
 
 * #4924: html search: Upper characters problem in any other languages
+* #4932: apidoc: some subpackage is ignored if sibling subpackage contains a
+  module starting with underscore
 
 Testing
 --------
diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py
index 921152ef1..a01439121 100644
--- a/sphinx/ext/apidoc.py
+++ b/sphinx/ext/apidoc.py
@@ -199,8 +199,8 @@ def shall_skip(module, opts, excludes=[]):
         # Yes, check if we have any non-excluded modules at all here
         all_skipped = True
         basemodule = path.dirname(module)
-        for module in glob.glob(path.join(basemodule, '*.py')):
-            if not is_excluded(path.join(basemodule, module), excludes):
+        for submodule in glob.glob(path.join(basemodule, '*.py')):
+            if not is_excluded(path.join(basemodule, submodule), excludes):
                 # There's a non-excluded module here, we won't skip
                 all_skipped = False
         if all_skipped: