diff --git a/AUTHORS b/AUTHORS
index d9877dff1f..adb6c18361 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -106,10 +106,10 @@ We have received the following contributions:
  - Patrik Lundin
    2016-07: Replace test by expr for < in configure.ac
 
- - Michal Humpula
+ - Michal Humpula (mihu)
    2016-07: Response to DHCPINFORM is sent to port 68
 
- - Andreas Rammhold
+ - Andreas Rammhold (andir)
    2016-09: Compilation fixes for GCC 6, using C++14.
 
 Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
diff --git a/ChangeLog b/ChangeLog
index 1dd9c0e903..4acb331292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1172.	[bug]		andir
+	Kea build fixes for gcc 6, which uses C++14 by default.
+	(github #29, git ad68c3942839618c26d7ff017fbac7df139b5d01)
+
 1171.	[doc]		marcin
 	Updated supported operating systems and the prerequisites for
 	installing and building Kea in the Kea Administrator