diff --git a/ChangeLog b/ChangeLog
index fdaaad4161..f94e8c2b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 14 08:28:59 2014  Zachary Scott  <e@zzak.io>
+
+	* man/rake.1: [DOC] Update links for Rake, patch by @hsbt [Bug #9904]
+	  [Fixes GH-628] https://github.com/ruby/ruby/pull/628
+
 Fri Jun 13 17:58:58 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_trace.c: add new method TracePoint.stat to debug
diff --git a/man/rake.1 b/man/rake.1
index 265112fca5..d8991546b5 100644
--- a/man/rake.1
+++ b/man/rake.1
@@ -191,14 +191,7 @@ The standard directory containing system wide rake files on Win 32 systems.
 .Xr ruby 1
 .Xr make 1
 .Pp
-.Pa http://rake.rubyforge.org/
-.Sh REPORTING BUGS
-Bugs, features requests and other issues can be logged at
-.Aq Pa http://onestepback.org/redmine/projects/show/rake .
-.Pp
-You will need an account to before you can post issues. Register at
-.Aq Pa http://onestepback.org/redmine/account/register .
-Or you can send an email to the author.
+.Pa https://github.com/ruby/rake
 .Sh AUTHOR
 .Nm Rake
 is written by