diff --git a/ChangeLog b/ChangeLog
index e0beb7f26845403bfec21ecbff51a95e694a994d..66cbeb610122f8f997a85d4017f1309e667efbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-18  Dmitry Eremin-Solenikov  <dbaryshkov@gmail.com>
+
+	Backported from master branch.
+	* examples/nettle-openssl.c): Move expressions with side effects
+	out of asserts.
+
 2018-12-26  Niels Möller  <nisse@lysator.liu.se>
 
 	* tools/nettle-pbkdf2.c: Add #define _GNU_SOURCE, needed for