diff --git a/History.txt b/History.txt
index b44445a41192..def414fe6f56 100644
--- a/History.txt
+++ b/History.txt
@@ -1,5 +1,12 @@
 # coding: UTF-8
 
+=== 1.8.21 / 2012-03-22
+
+* 2 bug fixes:
+
+  * Add workaround for buggy yaml output from 1.9.2
+  * Force 1.9.1 to remove it's prelude code. Fixes #305
+
 === 1.8.20 / 2012-03-21
 
 * 4 bug fixes:
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 866dabd484da..6c974fbc3d62 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -120,7 +120,7 @@ class << Gem
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.20'
+  VERSION = '1.8.21'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the