diff --git a/doc/drafts/draft-masarati-ldap-deref-xx.txt b/doc/drafts/draft-masarati-ldap-deref-xx.txt
index 46e20248ed..c5c9259367 100644
--- a/doc/drafts/draft-masarati-ldap-deref-xx.txt
+++ b/doc/drafts/draft-masarati-ldap-deref-xx.txt
@@ -206,6 +206,10 @@ Internet-Draft                 LDAP Deref                   October 2008
    response, without affecting its application to any subsequent
    SearchResultEntry response.
 
+   Servers implementing this technical specification SHOULD publish the
+   object identifier deref-oid (IANA assigned; see Section 6) as a value
+   of the 'supportedControl' attribute [RFC4512] in their root DSE.
+
    This control is totally unrelated to alias dereferencing [RFC4511].
 
 
@@ -216,10 +220,6 @@ Internet-Draft                 LDAP Deref                   October 2008
 
 
 
-
-
-
-
 Masarati & Chu            Expires April 4, 2009                 [Page 4]
 
 Internet-Draft                 LDAP Deref                   October 2008
@@ -227,7 +227,8 @@ Internet-Draft                 LDAP Deref                   October 2008
 
 2.2.  Control Request
 
-   The specification of the Dereference Control request is:
+   The control type is deref-oid (IANA assigned; see Section 6).  The
+   specification of the Dereference Control request is:
 
          controlValue ::= SEQUENCE OF derefSpec DerefSpec
 
@@ -241,7 +242,8 @@ Internet-Draft                 LDAP Deref                   October 2008
 
 2.3.  Control Response
 
-   The specification of the Dereference Control response is:
+   The control type is deref-oid (IANA assigned; see Section 6).  The
+   specification of the Dereference Control response is:
 
          controlValue ::= SEQUENCE OF derefRes DerefRes
 
@@ -274,8 +276,6 @@ Internet-Draft                 LDAP Deref                   October 2008
 
 
 
-
-
 Masarati & Chu            Expires April 4, 2009                 [Page 5]
 
 Internet-Draft                 LDAP Deref                   October 2008
diff --git a/doc/drafts/draft-masarati-ldap-deref.xml b/doc/drafts/draft-masarati-ldap-deref.xml
index 6edeef3627..aab2f032f5 100644
--- a/doc/drafts/draft-masarati-ldap-deref.xml
+++ b/doc/drafts/draft-masarati-ldap-deref.xml
@@ -159,6 +159,14 @@ without affecting its application to any subsequent SearchResultEntry
 response.
                 </t>
 
+                <t>
+Servers implementing this technical specification SHOULD publish
+the object identifier deref-oid (IANA assigned;
+see <xref target="iana_considerations" />) as a value
+of the 'supportedControl' attribute <xref target="RFC4512" />
+in their root DSE.
+                </t>
+
                 <t>
 This control is totally unrelated to alias dereferencing
 <xref target="RFC4511" />.
@@ -168,6 +176,8 @@ This control is totally unrelated to alias dereferencing
             <section anchor="control_request" title="Control Request">
                 <figure>
                     <preamble>
+The control type is deref-oid (IANA assigned;
+see <xref target="iana_considerations" />).
 The specification of the Dereference Control request is:
                     </preamble>
                     <artwork>
@@ -188,6 +198,8 @@ Each derefSpec.derefAttr MUST be unique within controlValue.
             <section anchor="control_response" title="Control Response">
                 <figure>
                     <preamble>
+The control type is deref-oid (IANA assigned;
+see <xref target="iana_considerations" />).
 The specification of the Dereference Control response is:
                     </preamble>
                     <artwork>
@@ -296,7 +308,7 @@ Security considerations described in documents listed in
         </t>
         </section>
 
-        <section title="IANA Considerations">
+        <section anchor="iana_considerations" title="IANA Considerations">
             <section title="Object Identifier Registration">
                 <figure>
                     <preamble>
diff --git a/doc/drafts/draft-masarati-ldap-whatfailed-xx.txt b/doc/drafts/draft-masarati-ldap-whatfailed-xx.txt
index e93c63ff39..a98c341077 100644
--- a/doc/drafts/draft-masarati-ldap-whatfailed-xx.txt
+++ b/doc/drafts/draft-masarati-ldap-whatfailed-xx.txt
@@ -71,17 +71,17 @@ Table of Contents
    2.  LDAP "What Failed?" Control  . . . . . . . . . . . . . . . . .  4
      2.1.  Control Semantics  . . . . . . . . . . . . . . . . . . . .  4
      2.2.  Control Request  . . . . . . . . . . . . . . . . . . . . .  4
-     2.3.  Control Response . . . . . . . . . . . . . . . . . . . . .  4
-   3.  Implementation Notes . . . . . . . . . . . . . . . . . . . . .  5
-   4.  Security Considerations  . . . . . . . . . . . . . . . . . . .  6
-   5.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . .  7
-     5.1.  Object Identifier Registration . . . . . . . . . . . . . .  7
-   6.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . .  8
-   7.  References . . . . . . . . . . . . . . . . . . . . . . . . . .  9
-     7.1.  Normative References . . . . . . . . . . . . . . . . . . .  9
-     7.2.  Informative References . . . . . . . . . . . . . . . . . .  9
-   Author's Address . . . . . . . . . . . . . . . . . . . . . . . . . 10
-   Intellectual Property and Copyright Statements . . . . . . . . . . 11
+     2.3.  Control Response . . . . . . . . . . . . . . . . . . . . .  5
+   3.  Implementation Notes . . . . . . . . . . . . . . . . . . . . .  6
+   4.  Security Considerations  . . . . . . . . . . . . . . . . . . .  7
+   5.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . .  8
+     5.1.  Object Identifier Registration . . . . . . . . . . . . . .  8
+   6.  Acknowledgments  . . . . . . . . . . . . . . . . . . . . . . .  9
+   7.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 10
+     7.1.  Normative References . . . . . . . . . . . . . . . . . . . 10
+     7.2.  Informative References . . . . . . . . . . . . . . . . . . 10
+   Author's Address . . . . . . . . . . . . . . . . . . . . . . . . . 11
+   Intellectual Property and Copyright Statements . . . . . . . . . . 12
 
 
 
@@ -201,14 +201,34 @@ Internet-Draft               LDAP WHATFAILED                October 2008
    ordering of controls handling when requesting the "What Failed?"
    control.
 
+   Servers implementing this technical specification SHOULD publish the
+   object identifier whatFailed-oid (IANA assigned; see Section 5) as a
+   value of the 'supportedControl' attribute [RFC4512] in their root
+   DSE.
+
 2.2.  Control Request
 
-   The controlType is whatFailed-oid; the controlValue MUST be absent;
-   the criticality SHOULD be FALSE.
+   The controlType is whatFailed-oid (IANA assigned; see Section 5); the
+   controlValue MUST be absent; the criticality SHOULD be FALSE.
+
+
+
+
+
+
+
+
+
+
+Masarati                  Expires April 4, 2009                 [Page 4]
+
+Internet-Draft               LDAP WHATFAILED                October 2008
+
 
 2.3.  Control Response
 
-   The controlType is whatFailed-oid; the controlValue is:
+   The controlType is whatFailed-oid (IANA assigned; see Section 5); the
+   controlValue is:
 
        controlValue ::= SET OF oid LDAPOID
 
@@ -220,7 +240,43 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-Masarati                  Expires April 4, 2009                 [Page 4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Masarati                  Expires April 4, 2009                 [Page 5]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -276,7 +332,7 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-Masarati                  Expires April 4, 2009                 [Page 5]
+Masarati                  Expires April 4, 2009                 [Page 6]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -332,7 +388,7 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-Masarati                  Expires April 4, 2009                 [Page 6]
+Masarati                  Expires April 4, 2009                 [Page 7]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -388,7 +444,7 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-Masarati                  Expires April 4, 2009                 [Page 7]
+Masarati                  Expires April 4, 2009                 [Page 8]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -444,7 +500,7 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-Masarati                  Expires April 4, 2009                 [Page 8]
+Masarati                  Expires April 4, 2009                 [Page 9]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -463,6 +519,10 @@ Internet-Draft               LDAP WHATFAILED                October 2008
    [RFC4511]  Sermersheim, J., "Lightweight Directory Access Protocol
               (LDAP): The Protocol", RFC 4511, June 2006.
 
+   [RFC4512]  Zeilenga, K., "Lightweight Directory Access Protocol
+              (LDAP): Directory Information Models", RFC 4512,
+              June 2006.
+
 7.2.  Informative References
 
    [RFC4526]  Zeilenga, K., "Lightweight Directory Access Protocol
@@ -496,11 +556,7 @@ Internet-Draft               LDAP WHATFAILED                October 2008
 
 
 
-
-
-
-
-Masarati                  Expires April 4, 2009                 [Page 9]
+Masarati                  Expires April 4, 2009                [Page 10]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -556,7 +612,7 @@ Author's Address
 
 
 
-Masarati                  Expires April 4, 2009                [Page 10]
+Masarati                  Expires April 4, 2009                [Page 11]
 
 Internet-Draft               LDAP WHATFAILED                October 2008
 
@@ -612,5 +668,5 @@ Intellectual Property
 
 
 
-Masarati                  Expires April 4, 2009                [Page 11]
+Masarati                  Expires April 4, 2009                [Page 12]
 
diff --git a/doc/drafts/draft-masarati-ldap-whatfailed.xml b/doc/drafts/draft-masarati-ldap-whatfailed.xml
index b205db7e94..1d8ce5e470 100644
--- a/doc/drafts/draft-masarati-ldap-whatfailed.xml
+++ b/doc/drafts/draft-masarati-ldap-whatfailed.xml
@@ -7,6 +7,8 @@
       'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4510.xml'>
     <!ENTITY rfc4511 PUBLIC '' 
       'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4511.xml'>
+    <!ENTITY rfc4512 PUBLIC '' 
+      'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4512.xml'>
     <!ENTITY rfc4526 PUBLIC '' 
       'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4526.xml'>
     <!ENTITY rfc4529 PUBLIC '' 
@@ -140,11 +142,20 @@ is malformed.
 Clients SHOULD NOT rely on any specific ordering of controls handling
 when requesting the "What Failed?" control.
                 </t>
+
+                <t>
+Servers implementing this technical specification SHOULD publish
+the object identifier whatFailed-oid (IANA assigned;
+see <xref target="iana_considerations" />) as a value
+of the 'supportedControl' attribute <xref target="RFC4512" />
+in their root DSE.
+                </t>
             </section>
 
             <section title="Control Request">
                 <t>
-The controlType is whatFailed-oid;
+The controlType is whatFailed-oid (IANA assigned;
+see <xref target="iana_considerations" />);
 the controlValue MUST be absent;
 the criticality SHOULD be FALSE.
                 </t>
@@ -153,7 +164,8 @@ the criticality SHOULD be FALSE.
             <section title="Control Response">
                 <figure>
                     <preamble>
-The controlType is whatFailed-oid;
+The controlType is whatFailed-oid (IANA assigned;
+see <xref target="iana_considerations" />);
 the controlValue is:
                     </preamble>
                     <artwork>
@@ -187,7 +199,7 @@ in the response.
             </t>
         </section>
 
-        <section title="IANA Considerations">
+        <section anchor="iana_considerations" title="IANA Considerations">
             <section title="Object Identifier Registration">
                 <figure>
                     <preamble>
@@ -217,6 +229,7 @@ Object Identifier for use in this technical specification.
             &rfc2119;
             &rfc4510;
             &rfc4511;
+            &rfc4512;
         </references>
         <references title='Informative References'>
             &rfc4526;