diff --git a/CHANGES b/CHANGES
index 6f2301f..cf8757a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Lib/
   generic wrapper arguments *args,**kwargs
 * LDIFParser.parse_change_records() now correctly calls
   LDIFParser.handle_change_modify()
+* Corrected ldap.controls.pwdpolicy.__all__
 
 Doc/
 * Started missing docs for sub-module ldap.sasl.
@@ -1215,4 +1216,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.362 2015/10/24 15:50:00 stroeder Exp $
+$Id: CHANGES,v 1.363 2015/10/24 15:55:07 stroeder Exp $
diff --git a/Lib/ldap/controls/pwdpolicy.py b/Lib/ldap/controls/pwdpolicy.py
index 0cb4260..dc013d4 100644
--- a/Lib/ldap/controls/pwdpolicy.py
+++ b/Lib/ldap/controls/pwdpolicy.py
@@ -5,11 +5,12 @@ ldap.controls.pwdpolicy - classes for Password Policy controls
 
 See http://www.python-ldap.org/ for project details.
 
-$Id: pwdpolicy.py,v 1.4 2014/03/12 21:34:07 stroeder Exp $
+$Id: pwdpolicy.py,v 1.5 2015/10/24 15:55:07 stroeder Exp $
 """
 
 __all__ = [
-  'ExpirationWarningControl'
+  'PasswordExpiringControl',
+  'PasswordExpiredControl',
 ]
 
 # Imports from python-ldap 2.4+