diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index f0e5b4a549c..7cddd9fd338 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -24,9 +24,12 @@ To use, simply 'import logging' and log away!
 """
 
 __all__ = ['BASIC_FORMAT', 'BufferingFormatter', 'CRITICAL', 'DEBUG', 'ERROR',
-           'FATAL', 'FileHandler', 'Filter', 'Filterer', 'Formatter', 'Handler',
-           'INFO', 'LogRecord', 'Logger', 'Manager', 'NOTSET', 'PlaceHolder',
-           'RootLogger', 'StreamHandler', 'WARN', 'WARNING']
+           'FATAL', 'FileHandler', 'Filter', 'Formatter', 'Handler', 'INFO',
+           'LogRecord', 'Logger', 'LoggerAdapter', 'NOTSET', 'NullHandler',
+           'StreamHandler', 'WARN', 'WARNING', 'addLevelName', 'basicConfig',
+           'captureWarnings', 'critical', 'debug', 'disable', 'error',
+           'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass',
+           'info', 'log', 'makeLogRecord', 'setLoggerClass', 'warn', 'warning']
 
 import sys, os, types, time, string, cStringIO, traceback
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 65ba2c15978..e44f22ab8fb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -148,7 +148,10 @@ Core and Builtins
 Library
 -------
 
-- Issue #5810: Fixed Distutils test_build_scripts so it uses 
+- Issue #5854: Updated __all__ to include some missing names and remove some
+  names which should not be exported.
+
+- Issue #5810: Fixed Distutils test_build_scripts so it uses
   sysconfig.get_config_vars.
 
 - Issue #5741: don't disallow "%%" (which is an escape for "%") when setting