diff --git a/CHANGES b/CHANGES
index 55182ab..ca9b7a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Released 2.4.15 2014-03-13
 Changes since 2.4.14:
 
 Lib/
+* Added missing modules ldap.controls.openldap and 
+  ldap.controls.pwdpolicy to setup.py
 
 Modules/
 
@@ -1085,4 +1087,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.311 2014/03/12 20:27:33 stroeder Exp $
+$Id: CHANGES,v 1.312 2014/03/12 20:29:23 stroeder Exp $
diff --git a/setup.py b/setup.py
index a9a6219..b2fe367 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ setup.py - Setup package with the help Python's DistUtils
 
 See http://www.python-ldap.org/ for details.
 
-$Id: setup.py,v 1.71 2011/10/26 19:42:25 stroeder Exp $
+$Id: setup.py,v 1.72 2014/03/12 20:29:23 stroeder Exp $
 """
 
 has_setuptools = False
@@ -151,8 +151,10 @@ setup(
     'ldap.async',
     'ldap.controls',
     'ldap.controls.libldap',
+    'ldap.controls.openldap',
     'ldap.controls.ppolicy',
     'ldap.controls.psearch',
+    'ldap.controls.pwdpolicy',
     'ldap.controls.readentry',
     'ldap.controls.sessiontrack',
     'ldap.controls.simple',