diff --git a/ChangeLog b/ChangeLog
index 44e778f116cfd1595c57412f21d376a9d4a97d63..e58899bb31530a212e9242125eb860492a4cce2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-08  Niels Möller  <nisse@lysator.liu.se>
+
+	From Nikos Mavrogiannopoulos. Support for versioned symbols.
+	* aclocal.m4 (LD_VERSION_SCRIPT): New macro. Substitute
+	EXTRA_LINKER_FLAGS and EXTRA_HOGWEED_LINKER_FLAGS.
+	* configure.ac: Use LD_VERSION_SCRIPT. Generate libnettle.map
+	and libhogweed.map.
+	(HOGWEED_EXTRA_SYMBOLS): New substituted variable.
+	* libnettle.map.in: New file, libnettle.so linker script
+	* libhogweed.map.in: New file, libhogweed.so linker script.
+	* Makefile.in ($(LIBNETTLE_FORLINK)): Use EXTRA_LINKER_FLAGS.
+	($(LIBHOGWEED_FORLINK)): Use EXTRA_HOGWEED_LINKER_FLAGS.
+
 2014-11-24  Niels Möller  <nisse@lysator.liu.se>
 
 	* gcm.h (GCM_SET_KEY): Rename macro argument KEY to avoid