diff --git a/AUTHORS b/AUTHORS
index b2a98b7cd1..62976b4a7f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,6 +70,9 @@ We have received the following contributions:
    2014-11: Export CalloutManager headers for testing statically linked
             libraries.
 
+ - David Gutierrez Rueda, CERN
+   2014-12: Support for client link-address option in DHCPv6 (RFC6939)
+
 Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
 Boost (http://www.boost.org/) library for almost everything, and can use Botan
 (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for
diff --git a/ChangeLog b/ChangeLog
index a675817c78..6d0c9528d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+6XX.	[func]		dgutier
+	Support for client link-layer address option (RFC6939) has
+	been added.
+	(Trac #3551, git abcd)
+
 860.	[bug]		marcin
 	Fixed calculation of the Client FQDN option length for the ASCII
 	domain name encoding.
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 20d100e8b6..d9cc54a2c1 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -1802,6 +1802,13 @@ should include options from the isc option space:
             <ulink url="http://tools.ietf.org/html/rfc4704">RFC 4704</ulink>:
             Supported option is CLIENT_FQDN.</simpara>
           </listitem>
+	  <listitem>
+	    <simpara><emphasis>Client Link-Layer Address Option in
+	    DHCPv6</emphasis>,
+	    <ulink url="http://tools.ietf.org/html/rfc6939">RFC
+	    6939</ulink>: Supported option is client link-layer
+	    address option.</simpara>
+	  </listitem>
       </itemizedlist>
     </section>