diff --git a/ChangeLog b/ChangeLog
index b9242de41a..1b45e14530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jul 19 22:25:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_match2): add warning to "~string".
+	  [ruby-list:37751]
+
+	* lib/net/ftp.rb (Net::FTP::open): takes block.  suggested by Gavin
+	  Sinclair in [ruby-core:01237].
+
 Sat Jul 19 19:03:24 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
 
 	* wince/stdlib.c: add bsearch().
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index b34c648bf3..6f5f848070 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -87,8 +87,20 @@ module Net
     #
     # A synonym for +FTP.new+, but with a mandatory host parameter.
     #
+    # If a block is given, it is passed the +FTP+ object, which will be closed
+    # when the block finishes, or when an exception is raised.
+    #
     def FTP.open(host, user = nil, passwd = nil, acct = nil)
-      new(host, user, passwd, acct)
+      if block_given?
+        ftp = new(host, user, passwd, acct)
+        begin
+          yield ftp
+        ensure
+          ftp.close
+        end
+      else
+        new(host, user, passwd, acct)
+      end
     end
     
     #
diff --git a/string.c b/string.c
index 692a158c09..b2761f04eb 100644
--- a/string.c
+++ b/string.c
@@ -1063,6 +1063,9 @@ rb_str_match2(str)
     VALUE str;
 {
     StringValue(str);
+#if RUBY_VERSION_CODE < 181
+	rb_warn("~string will be obsolete; use explicit regexp");
+#endif
     return rb_reg_match2(rb_reg_regcomp(rb_reg_quote(str)));
 }