diff --git a/ChangeLog b/ChangeLog
index c1218a4633..f7ac077f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 13 11:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
+
+	* lib/optparse.rb: Remove unreachable email address from documentation
+	  [Bug #6996] [ruby-core:47459]
+
 Thu Sep 13 11:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
 
 	* lib/xmlrpc.rb: Documentation for XMLRPC
diff --git a/lib/optparse.rb b/lib/optparse.rb
index dcb67604e2..272b99d411 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -204,8 +204,7 @@
 # === Further documentation
 #
 # The above examples should be enough to learn how to use this class.  If you
-# have any questions, email me (gsinclair@soyabean.com.au) and I will update
-# this document.
+# have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
 class OptionParser
   # :stopdoc: