diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index acb852baf..96cad558b 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-08  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* alist.c (scm_acons):  Use SCM{_SET}?_CELL_OBJECT as long as a
+	cell is not known to be a valid pair.
+
 2000-05-08  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* eval.c (ASRTSYNTAX, scm_m_body, scm_m_letrec1):  Removed
diff --git a/libguile/alist.c b/libguile/alist.c
index c04446aa6..db8602e19 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -65,12 +65,12 @@ SCM_DEFINE (scm_acons, "acons", 3, 0, 0,
   SCM head;
 
   SCM_NEWCELL (pair);
-  SCM_SETCAR (pair, key);
-  SCM_SETCDR (pair, value);
+  SCM_SET_CELL_OBJECT_0 (pair, key);
+  SCM_SET_CELL_OBJECT_1 (pair, value);
 
   SCM_NEWCELL (head);
-  SCM_SETCAR (head, pair);
-  SCM_SETCDR (head, alist);
+  SCM_SET_CELL_OBJECT_0 (head, pair);
+  SCM_SET_CELL_OBJECT_1 (head, alist);
 
   return head;
 }