diff --git a/CHANGELOG b/CHANGELOG
index b910d5f..05d931f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 head:
 
+- Use custom __method__ in Ruby versions *prior* to 1.8.7 not *up to* 1.8.7.
+
 - Rename Kernel#memoize to Kernel#expirable_memoize so that it doesn't conflict with memoize method in ActiveSupport which has an entirely different API and semantics. Reported by [Florian Dütsc (mail@florian-duetsch.de)].
 
 0.6.0:
diff --git a/lib/aws/s3/version.rb b/lib/aws/s3/version.rb
index 3f8f703..a6c414d 100644
--- a/lib/aws/s3/version.rb
+++ b/lib/aws/s3/version.rb
@@ -3,8 +3,8 @@ module AWS
     module VERSION #:nodoc:
       MAJOR    = '0'
       MINOR    = '6'
-      TINY     = '0' 
-      BETA     = Time.now.to_i.to_s
+      TINY     = '1' 
+      BETA     = #Time.now.to_i.to_s
     end
     
     Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY, VERSION::BETA].compact * '.'