diff --git a/NEWS b/NEWS
index d5f4887a9..7279974d0 100644
--- a/NEWS
+++ b/NEWS
@@ -584,6 +584,16 @@ starting the week.
 
 * Changes to the C interface
 
+** SCM_CELL_WORD_LOC has been deprecated.
+
+Use the new macro SCM_CELL_OBJECT_LOC instead, which return a pointer
+to a SCM, as opposed to a pointer to a scm_t_bits.
+
+This was done to allow the correct use of pointers into the Scheme
+heap.  Previously, the heap words were of type scm_t_bits and local
+variables and function arguments were of type SCM, making it
+non-standards-conformant to have a pointer that can point to both.
+
 ** New macros SCM_SMOB_DATA_2, SM_SMOB_DATA_3, etc.
 
 These macros should be used instead of SCM_CELL_WORD_2/3 to access the
diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index 97262f805..31f162704 100644
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-06  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* scheme-smobs.texi: Updated for new SCM_SMOB_* macros.
+
+	* preface.texi: Moved around the sections so that the manual
+	overview comes first.
+
+	* libguile-smobs.texi: Updated for the new role of scm_t_bits.
+
 2004-04-21  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
 
 	* Big reorganization of the whole manual to give it a simpler