diff --git a/CHANGES b/CHANGES
index e04b55e5e..9409424b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,9 @@
 
 * Fixed default verbose mode (was accidently changed to false).  
 
+* Removed reference to manage_gem to fix the warning produced by the
+  gem package task.
+
 == Version 0.8.3
 
 * Enhanced the system directory detection in windows. We now check
diff --git a/doc/release_notes/rake-0.8.4.rdoc b/doc/release_notes/rake-0.8.4.rdoc
index a377aca78..241fd0583 100644
--- a/doc/release_notes/rake-0.8.4.rdoc
+++ b/doc/release_notes/rake-0.8.4.rdoc
@@ -2,6 +2,12 @@
 
 Rake version 0.8.4 is a bug-fix release of rake.
 
+NOTE: The version of Rake that comes with Ruby 1.9 has diverged
+      slightly from the core Rake code base.  Rake 0.8.4 will work
+      with Ruby 1.9, but is not a strict upgrade for the Rake that
+      comes with Ruby 1.9.  A (near) future release of Rake will unify
+      those two codebases.
+
 == Changes
 
 === New Features / Enhancements in Version 0.8.4
@@ -9,6 +15,9 @@ Rake version 0.8.4 is a bug-fix release of rake.
 * Case is preserved on rakefile names. (patch from James
   M. Lawrence/quix)
 
+* Improved Rakefile case insensitivity testing (patch from Luis
+  Lavena).
+
 * Windows system dir search order is now: HOME, HOMEDRIVE + HOMEPATH,
   APPDATA, USERPROFILE (patch from Luis Lavena)
 
@@ -17,6 +26,9 @@ Rake version 0.8.4 is a bug-fix release of rake.
 
 === Bug Fixes in Version 0.8.4
 
+* Removed reference to manage_gem to fix the warning produced by the
+  gem package task.
+
 * Fixed stray ARGV option problem that was interfering with
   Test::Unit::Runner. (patch from Pivotal Labs)