diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 3eef926971..ddbce32295 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-21  Mikael Starvik  <starvik@axis.com>
+
+	* cris.cpu (cris-set-mem): Correct integral write semantics.
+
 2004-11-29  Hans-Peter Nilsson  <hp@axis.com>
 
 	* cris.cpu: New file.
diff --git a/cpu/cris.cpu b/cpu/cris.cpu
index 6bfa539f90..955ad32189 100644
--- a/cpu/cris.cpu
+++ b/cpu/cris.cpu
@@ -2224,7 +2224,10 @@
 	    (sequence
 	      ()
 	      (set (mem size addr) value)
-	      (set cbit 0))
+	      ; Write failures are signalled (by whatever entity "sends
+	      ; the signal") by setting P at time of the write above, if X
+	      ; is set.  Here, we just need to copy P into C.
+	      (set cbit pbit))
 	    (set cbit 1))
 	(set (mem size addr) value))