diff --git a/ChangeLog b/ChangeLog
index ef54419f1d..9cdcb28ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 20 21:25:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb (self.open): If a block is given, call it with
+	  tempfile as an argument and automatically close the tempfile
+	  when the block terminates.
+
 Mon Jan 20 21:02:50 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 	* mdoc2man.rb: Properly put nested braces, parentheses and angles.
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index e68452fe6a..b122795294 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -148,9 +148,25 @@ class Tempfile < SimpleDelegator
       }
     end
 
-    # Equivalent to new().
+    # If no block is given, this is a synonym for new().
+    #
+    # If a block is given, it will be passed tempfile as an argument,
+    # and the tempfile will automatically be closed when the block
+    # terminates.  In this case, open() returns nil.
     def open(*args)
-      new(*args)
+      tempfile = new(*args)
+
+      if block_given?
+	begin
+	  yield(tempfile)
+	ensure
+	  tempfile.close
+	end
+
+	nil
+      else
+	tempfile
+      end
     end
   end
 end