diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a68462..31b11a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## master (unreleased)
 
-## 2.0.0
+## 2.0.0-pre
+  - Massive overhaul in the way formatters work. Now they are registered with a factory pattern, which includes 
+    a simple method to determine if that formatter can handle the content. [@imajes]
+  - Remove support for mongo mapper, and ruby pre 2.x [@imajes]
+  - It's probably faster? :)
   - Fixes spec suite to properly work via travis, gets a clean build [@imajes, others]
   - Adds support for ActiveModel::Errors [@dshinzie] - [#301]
   - removes use of `strip_heredoc` from specs as it's a rails dep [@kstephens] - [#303]
diff --git a/awesome_print.gemspec b/awesome_print.gemspec
index 0ebbef6..6889b38 100644
--- a/awesome_print.gemspec
+++ b/awesome_print.gemspec
@@ -4,9 +4,8 @@ require 'awesome_print/version'
 Gem::Specification.new do |s|
   s.name        = 'awesome_print'
   s.version     = AwesomePrint.version
-  s.authors     = 'Michael Dvorkin'
+  s.authors     = 'Michael Dvorkin, James Cox & contributors'
   s.date        = Time.now.strftime('%Y-%m-%d')
-  s.email       = 'mike@dvorkin.net'
   s.homepage    = 'https://github.com/awesome-print/awesome_print'
   s.summary     = 'Pretty print Ruby objects with proper indentation and colors'
   s.description = 'Great Ruby debugging companion: pretty print Ruby objects to visualize their structure. Supports custom object formatting via plugins'
diff --git a/lib/awesome_print/version.rb b/lib/awesome_print/version.rb
index 37c7c1f..dcc2407 100644
--- a/lib/awesome_print/version.rb
+++ b/lib/awesome_print/version.rb
@@ -5,6 +5,6 @@ module AwesomePrint
   end
 
   def self.version
-    '1.8.0'
+    '2.0.0-pre'
   end
 end