diff --git a/ChangeLog b/ChangeLog
index e455883a46..7b7fb7d6ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
+	  @n_bytes as well.  [ruby-core:16144]
+
 Fri Apr  4 00:42:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (Init_Bignum): rdiv method removed.  [ruby-dev:34242]
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index cbe5630271..1562f90833 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -577,6 +577,8 @@ module Net
 
     def do_finish
       @mails = nil
+      @n_mails = nil
+      @n_bytes = nil
       @command.quit if @command
     ensure
       @started = false