diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 0822b2dcd..574fcc546 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-11  Neil Jerram  <neil@ossau.uklinux.net>
 
+	* unif.c (string_set): Don't return in a void function.  (Reported
+	by Mike Gran.)
+
 	* srfi-4.c (scm_uniform_vector_read_x): Declare base as char*
 	rather than void*, so we can do pointer arithmetic on it.
 	(Reported by Mike Gran.)
diff --git a/libguile/unif.c b/libguile/unif.c
index b16baa19b..7f01f62dd 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -368,9 +368,9 @@ string_set (scm_t_array_handle *h, ssize_t pos, SCM val)
 {
   pos += h->base;
   if (SCM_I_ARRAYP (h->array))
-    return scm_c_string_set_x (SCM_I_ARRAY_V (h->array), pos, val);
+    scm_c_string_set_x (SCM_I_ARRAY_V (h->array), pos, val);
   else
-    return scm_c_string_set_x (h->array, pos, val);
+    scm_c_string_set_x (h->array, pos, val);
 }
 
 static void