diff --git a/ChangeLog b/ChangeLog
index 95a6d4f46c..e45a6138bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Tue Dec 16 11:37:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* load.c (rb_feature_p): ditto.
 
+	* dln.c (dln_load): ditto.
+
 Tue Dec 16 09:14:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (block_call): block should not be given to yield.
diff --git a/dln.c b/dln.c
index 69f44a7add..bb64c52a0f 100644
--- a/dln.c
+++ b/dln.c
@@ -1433,8 +1433,8 @@ dln_load(const char *file)
       if (err_stat != B_NO_ERROR) {
 	char real_name[MAXPATHLEN];
 
-	strcpy(real_name, buf);
-	strcat(real_name, "__Fv");
+	strlcpy(real_name, buf, MAXPATHLEN);
+	strlcat(real_name, "__Fv", MAXPATHLEN);
         err_stat = get_image_symbol(img_id, real_name,
 				    B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
       }