diff --git a/ChangeLog b/ChangeLog
index 7a0901f3ad..68533ba5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Dec 28 11:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
+	  [ruby-talk:88852]
+
+	* test/csv/{bom.csv,mac.csv}: removed.
+
 Sun Dec 28 08:56:51 2003  Dave Thomas  <dave@pragprog.com>
 
 	* eval.c: Thead[Group] RDoc (thanks to MG)
@@ -28,8 +35,8 @@ Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
 Sun Dec 28 00:46:25 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
-		  Some Ruby source uses lower-case class names for the
-		  Init_Xxx C function name.
+	  Some Ruby source uses lower-case class names for the
+	  Init_Xxx C function name.
 
 Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
diff --git a/MANIFEST b/MANIFEST
index c969de85ae..831072bba5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -670,8 +670,6 @@ sample/wsdl/googleSearch/sjissearch.sh
 sample/wsdl/googleSearch/wsdlDriver.rb
 sample/wsdl/raa/raa.wsdl
 sample/wsdl/raa/soap4r.rb
-test/csv/bom.csv
-test/csv/mac.csv
 test/csv/test_csv.rb
 test/digest/test_digest.rb
 test/drb/drbtest.rb
diff --git a/test/csv/bom.csv b/test/csv/bom.csv
deleted file mode 100644
index 47ab7a601c..0000000000
--- a/test/csv/bom.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"foo"
-"bar"
diff --git a/test/csv/mac.csv b/test/csv/mac.csv
deleted file mode 100644
index 95b1a1725b..0000000000
--- a/test/csv/mac.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Avenches","aus Umgebung"
-"Bad Hersfeld","Ausgrabung"
\ No newline at end of file
diff --git a/test/csv/test_csv.rb b/test/csv/test_csv.rb
index 6cc4c5cac7..7092470915 100644
--- a/test/csv/test_csv.rb
+++ b/test/csv/test_csv.rb
@@ -275,8 +275,8 @@ public
     @infiletsv = File.join(@tmpdir, 'in.tsv')
     @emptyfile = File.join(@tmpdir, 'empty.csv')
     @outfile = File.join(@tmpdir, 'out.csv')
-    @bomfile = File.join(File.dirname(__FILE__), "bom.csv")
-    @macfile = File.join(File.dirname(__FILE__), "mac.csv")
+    @bomfile = File.join(@tmpdir, "bom.csv")
+    @macfile = File.join(@tmpdir, "mac.csv")
 
     CSV.open(@infile, "w") do |writer|
       @@fullCSVDataArray.each do |row|
@@ -293,6 +293,14 @@ public
     CSV.generate(@emptyfile) do |writer|
       # Create empty file.
     end
+
+    File.open(@bomfile, "wb") do |f|
+      f.write("\357\273\277\"foo\"\r\n\"bar\"\r\n")
+    end
+
+    File.open(@macfile, "wb") do |f|
+      f.write("\"Avenches\",\"aus Umgebung\"\r\"Bad Hersfeld\",\"Ausgrabung\"")
+    end
   end
 
   def teardown