diff --git a/ChangeLog b/ChangeLog
index 1875b68cba..e49bab5fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
+	  [ruby-talk:103062]
+
 Wed Jun  9 16:09:01 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::merge,
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 2dfd17196c..0f9ae1dbff 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -475,14 +475,12 @@ fsdbm_store(obj, keystr, valstr)
     }
 
     fdbm_modify(obj);
-    keystr = rb_obj_as_string(keystr);
+    StringValue(keystr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    if (NIL_P(valstr)) return fsdbm_delete(obj, keystr);
-
-    valstr = rb_obj_as_string(valstr);
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;