diff --git a/ChangeLog b/ChangeLog
index a5ddd98581..7b01512468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 10:23:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/base64.rb (Base64::b64encode): should not specify /o option
+	  for regular expression.  [ruby-dev:31221]
+
 Wed Aug 22 10:20:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): more checks for format argument.
diff --git a/lib/base64.rb b/lib/base64.rb
index 05be9ddf78..8628d611b2 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -110,7 +110,7 @@ module Base64
   #    UnVieQ==
 
   def b64encode(bin, len = 60)
-    encode64(bin).scan(/.{1,#{len}}/o) do
+    encode64(bin).scan(/.{1,#{len}}/) do
       print $&, "\n"
     end
   end 
diff --git a/version.h b/version.h
index bf33a95844..80212e47f3 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 66
+#define RUBY_PATCHLEVEL 67
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8