diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8ea1ba14f..e8e287983 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,10 @@
 
 Drupal 7.25, xxxx-xx-xx (development version)
 -----------------------
+- Fixed a bug in the Node module which caused fatal errors on preview when a
+  field is displayed in the node teaser but hidden in the full node view. The
+  fix removes a field_attach_prepare_view() call from the node_preview()
+  function, since this is already done in the node preview theme layer.
 - Fixed a bug in the Search module that caused exceptions to be thrown during
   searches if the server was not configured to represent decimal points as a
   period.