diff --git a/src/ChangeLog b/src/ChangeLog
index 00cc2e38a88..27df9aa1af5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-25  Ken Raeburn  <raeburn@raeburn.org>
 
+	* coding.h (decode_coding_string, encode_coding_string): Use
+	SCHARS macro.
+
 	* lread.c: Rewrite 2009-07-21 changes.
 	(load_depth): Deleted.
 	(Qload_in_progress): New variable.
diff --git a/src/coding.h b/src/coding.h
index 450433fda96..3e89ff10421 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -734,11 +734,11 @@ extern void encode_coding_object P_ ((struct coding_system *,
 
 
 #define decode_coding_string(coding, string, nocopy)			\
-  decode_coding_object (coding, string, 0, 0, XSTRING (string)->size,	\
+  decode_coding_object (coding, string, 0, 0, SCHARS (string),		\
 			STRING_BYTES (XSTRING (string)), Qt)
 
 #define encode_coding_string(coding, string, nocopy)			\
-  (encode_coding_object (coding, string, 0, 0, XSTRING (string)->size,	\
+  (encode_coding_object (coding, string, 0, 0, SCHARS (string),		\
 			 STRING_BYTES (XSTRING (string)), Qt),		\
    (coding)->dst_object)