diff --git a/README b/README
index 00f8b78..8f6b1f9 100644
--- a/README
+++ b/README
@@ -15,15 +15,16 @@ Release notes for fedfs-utils 0.11-devel
 Release Quality Statement
 ------- ------- ---------
 
+The implementation of this package is based on RFC 6641, RFC 7532, and
+RFC 7533. These documents are Proposed Standards.
+
 This is an ALPHA quality release.  The code in this release is not
 guaranteed to work.  Programming, administrative, and user interfaces
 may change significantly before the next release.  This release is
 for technology preview only.
 
-Warning: The implementation in this package is based on internet draft
-standards that are still evolving.  The current release of fedfs-utils
-may not be compatible with the next release of this package, nor with
-implementations from other vendors.
+The current release of fedfs-utils may not be compatible with the next
+release of this package, nor with implementations from other vendors.
 
 
 Intellectual Property Disclaimer
diff --git a/doc/ldap/fedfs-schema.ldif b/doc/ldap/fedfs-schema.ldif
index c41297d..34d14bb 100644
--- a/doc/ldap/fedfs-schema.ldif
+++ b/doc/ldap/fedfs-schema.ldif
@@ -1,10 +1,9 @@
 #
-# Copyright (c) 2010-2012 IETF Trust and the persons identified
+# Copyright (c) 2015 IETF Trust and the persons identified
 # as authors of the code.  All rights reserved.
 #
-# The authors of the code are the authors of
-# [draft-ietf-nfsv4-federated-fs-protocol-xx.txt]: J. Lentini,
-# C. Everhart, D. Ellard, R. Tewari, and M. Naik.
+# The authors of the code are:
+# J.Lentini, C. Everhart, D. Ellard, R. Tewari, and M. Naik.
 #
 # Redistribution and use in source and binary forms, with
 # or without modification, are permitted provided that the
diff --git a/doc/ldap/fedfs.schema b/doc/ldap/fedfs.schema
index c80f41d..ab75421 100644
--- a/doc/ldap/fedfs.schema
+++ b/doc/ldap/fedfs.schema
@@ -1,10 +1,9 @@
 #
-# Copyright (c) 2010-2012 IETF Trust and the persons identified
+# Copyright (c) 2015 IETF Trust and the persons identified
 # as authors of the code.  All rights reserved.
 #
-# The authors of the code are the authors of
-# [draft-ietf-nfsv4-federated-fs-protocol-xx.txt]: J. Lentini,
-# C. Everhart, D. Ellard, R. Tewari, and M. Naik.
+# The authors of the code are:
+# J.Lentini, C. Everhart, D. Ellard, R. Tewari, and M. Naik.
 #
 # Redistribution and use in source and binary forms, with
 # or without modification, are permitted provided that the
diff --git a/doc/man/nsdb-list.8.in b/doc/man/nsdb-list.8.in
index 9f2c668..0574715 100644
--- a/doc/man/nsdb-list.8.in
+++ b/doc/man/nsdb-list.8.in
@@ -219,8 +219,7 @@ To resolve the listed FSN UUID, use the
 .BR nsdb-resolve-junction (8)
 command.
 .SH SECURITY
-The NSDB protocol draft standard requires that FedFS FSN and FSL
-records are readable by everyone.
+RFC 7532 requires that FedFS FSN and FSL records are readable by everyone.
 The
 .BR nsdb-list (8)
 command uses anonymous binding when performing LDAP queries.
diff --git a/doc/man/nsdb-resolve-fsn.8.in b/doc/man/nsdb-resolve-fsn.8.in
index 5218e48..af09993 100644
--- a/doc/man/nsdb-resolve-fsn.8.in
+++ b/doc/man/nsdb-resolve-fsn.8.in
@@ -271,8 +271,7 @@ dn: fedfsFslUuid=323c5068-7c11-11e0-8d38-000c297fd679,
 .RE
 and so on.
 .SH SECURITY
-The NSDB protocol draft standard requires that FedFS FSN and FSL
-records are readable by everyone.
+RFC 7532 requires that FedFS FSN and FSL records are readable by everyone.
 The
 .BR nsdb-resolve-fsn (8)
 command uses anonymous binding to perform LDAP queries.
diff --git a/doc/rpcl/fedfs_admin.x b/doc/rpcl/fedfs_admin.x
index da03520..d571a1b 100644
--- a/doc/rpcl/fedfs_admin.x
+++ b/doc/rpcl/fedfs_admin.x
@@ -8,12 +8,11 @@
 #endif
 
 /*
- * Copyright (c) 2010-2012 IETF Trust and the persons identified
+ * Copyright (c) 2015 IETF Trust and the persons identified
  * as authors of the code.  All rights reserved.
  *
- * The authors of the code are the authors of
- * [draft-ietf-nfsv4-federated-fs-admin-xx.txt]: J. Lentini,
- * C. Everhart, D. Ellard, R. Tewari, and M. Naik.
+ * The authors of the code are:
+ * J. Lentini, C. Everhart, D. Ellard, R. Tewari, and M. Naik.
  *
  * Redistribution and use in source and binary forms, with
  * or without modification, are permitted provided that the
diff --git a/src/include/admin.h b/src/include/admin.h
index 2887db9..6897ae9 100644
--- a/src/include/admin.h
+++ b/src/include/admin.h
@@ -175,8 +175,7 @@ const char	*admin_perror(admin_t host, const char *prefix);
 
 
 /**
- ** ADMIN operations defined in the
- ** ADMIN protocol draft, Chapter 5)
+ ** ADMIN operations defined in RFC 7533, Chapter 5)
  **/
 
 /**
diff --git a/src/include/junction.h b/src/include/junction.h
index f15d200..c35e71a 100644
--- a/src/include/junction.h
+++ b/src/include/junction.h
@@ -41,7 +41,7 @@
  * IP address or one DNS hostname.
  *
  * See Section 11.9 and 11.10 of RFC 5661 or section 4.2.2.3 and
- * 4.2.2.4 of the NSDB protocol draft for details.
+ * 4.2.2.4 of RFC 7532 for details.
  */
 
 struct nfs_fsloc {
diff --git a/src/include/nsdb.h b/src/include/nsdb.h
index 4636f1f..89897df 100644
--- a/src/include/nsdb.h
+++ b/src/include/nsdb.h
@@ -43,7 +43,7 @@ typedef struct fedfs_nsdb *nsdb_t;
  * Object that contains FedFS Fileset Name data
  *
  * Derived from the fedfsFsn object class, defined in
- * the NSDB protocol draft, chapter 4, section 2.2.2
+ * RFC7532, chapter 4, section 2.2.2
  */
 struct fedfs_fsn {
 	char			 *fn_dn;
diff --git a/src/libnsdb/annotation.c b/src/libnsdb/annotation.c
index 8ad759b..67d2c77 100644
--- a/src/libnsdb/annotation.c
+++ b/src/libnsdb/annotation.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Quoting NSDB draft Section 4.2.1.12:
+ * Quoting RFC 7532, Section 4.2.1.12:
  *
  * @verbatim
 
@@ -280,7 +280,7 @@ nsdb_skip_whitespace(const char *buf, const size_t len,
  * We don't check that the attribute value contains valid UTF-8 characters:
  * LDAP will exclude invalid strings.
  *
- * Quoting NSDB draft Section 4.2.1.12:
+ * Quoting RFC 7532, Section 4.2.1.12:
  *
  * @verbatim
 
@@ -301,7 +301,7 @@ nsdb_parse_annotation(const char *annotation, size_t len,
 	char *tmpval = NULL;
 	size_t i;
 
-	/* NSDB draft doesn't limit size of these, but let's 
+	/* RFC 7532 doesn't limit size of these, but let's
 	 * protect ourselves from badness */
 	if (len < strlen("\"\"=\"\"") || len > 8192)
 		goto out_ignored;
diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c
index 244a309..a262710 100644
--- a/src/libnsdb/fileserver.c
+++ b/src/libnsdb/fileserver.c
@@ -219,7 +219,7 @@ nsdb_alloc_fedfs_fsl(void)
  *
  * @param fsl pointer to struct fedfs_fsl
  *
- * See NSDB protocol draft Section 5.1.3.2.
+ * See RFC 7532, Section 5.1.3.2.
  */
 static void
 nsdb_init_fedfs_nfs_fsl(struct fedfs_fsl *fsl)
diff --git a/src/nfsref/add.c b/src/nfsref/add.c
index 865adc0..575041b 100644
--- a/src/nfsref/add.c
+++ b/src/nfsref/add.c
@@ -85,7 +85,7 @@ nfsref_add_help(const char *progname)
  *
  * @param new NFS location structure to fill in
  *
- * See section 5.1.3.2 of the NSDB protocol draft.
+ * See section 5.1.3.2 of RFC 7532.
  */
 static void
 nfsref_add_fsloc_defaults(struct nfs_fsloc *new)
@@ -302,7 +302,7 @@ nfsref_add_create_fedfs_fsn(nsdb_t host, const char *nce, char **fsn_uuid)
  * @param rootpath NUL-terminated C string containing POSIX-style export path
  * @param new fedfs_fsl object to fill in
  *
- * See section 5.1.3.2 of the NSDB protocol draft.
+ * See section 5.1.3.2 of RFC 7532.
  */
 static FedFsStatus
 nfsref_add_nfs_fsl_defaults(const char *server, const char *rootpath,
