diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index 8c2f2c936..081f4eaa8 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-16  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
+
+	(scm_char_set_map): Bug-fix: char-set-map was modifying the
+	argument instead of the return value.
+
 2001-07-16  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
 
 	* srfi-14.c: Allocate correct memory size for charsets (32 bytes),
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index 878349158..14a717a80 100644
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -429,7 +429,7 @@ SCM_DEFINE (scm_char_set_map, "char-set-map", 2, 0, 0,
 	SCM ch = scm_call_1 (proc, SCM_MAKE_CHAR (k));
 	if (!SCM_CHARP (ch))
 	  SCM_MISC_ERROR ("procedure ~S returned non-char", scm_list_1 (proc));
-	SCM_CHARSET_SET (cs, SCM_CHAR (ch));
+	SCM_CHARSET_SET (result, SCM_CHAR (ch));
       }
   return result;
 }