diff --git a/History.txt b/History.txt
index c887237364a7..06804233c641 100644
--- a/History.txt
+++ b/History.txt
@@ -1,5 +1,20 @@
 # coding: UTF-8
 
+=== 1.8.17 / 2012-02-17
+
+* 2 minor enhancements:
+
+  * Add MacRuby to the list of special cases for platforms (ferrous26)
+  * Add a default for where to install rubygems itself
+
+* 3 bug fixes:
+
+  * Fixed gem loading issue caused by dependencies not resolving.
+  * Fixed umask error when stdlib is required and unresolved dependencies exist.
+  * Shebang munging would only take one arg after the cmd
+  * Define SUCKAGE better, ie only MRI 1.9.2
+  * Propagate env-shebang to the pristine command if set for install.
+
 === 1.8.16 / 2012-02-12
 
 * 3 bug fixes:
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 4afd10e64088..f893b4e5bb98 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -120,7 +120,7 @@ class << Gem
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.16'
+  VERSION = '1.8.17'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the