1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6df5a5a6344..030ef37e850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-03  Ulrich Müller  <ulm@gentoo.org>
+
+        * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Add -nopie option if it
+        is supported, in order to avoid segfaults in temacs.  (Bug#18784)
+
 2015-03-27  Pete Williamson  <petewil@chromium.org>  (tiny change)
 
         Add NaCl target