diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 171420ab..d25349a8 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,4 +1,7 @@
+== 1.2.1
+
 * enhancements
+  * Added haml generator support (by github.com/grimen)
   * Added error_notification message to form builder
   * Added required by default as configuration option
   * Added label_input as component, allowing boolean to change its order (input appearing first than label)
diff --git a/TODO.rdoc b/TODO.rdoc
index 5db72e87..5bf2a921 100644
--- a/TODO.rdoc
+++ b/TODO.rdoc
@@ -1,8 +1,2 @@
-== General
-
-* Pretty buttons
-
-== Validations
-
 * Add unobstrusive javascript validations support
 * Add mask support (same as hint, but with JS)
diff --git a/simple_form.gemspec b/simple_form.gemspec
index 9cff1bb4..17aee640 100644
--- a/simple_form.gemspec
+++ b/simple_form.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-24}
   s.description = %q{Forms made easy!}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "lib/generators/simple_form/USAGE",
      "lib/generators/simple_form/install_generator.rb",
      "lib/generators/simple_form/templates/_form.html.erb",
+     "lib/generators/simple_form/templates/_form.html.haml",
      "lib/generators/simple_form/templates/en.yml",
      "lib/generators/simple_form/templates/simple_form.rb",
      "lib/simple_form.rb",
@@ -31,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/simple_form/components/label_input.rb",
      "lib/simple_form/components/labels.rb",
      "lib/simple_form/components/wrapper.rb",
+     "lib/simple_form/error_notification.rb",
      "lib/simple_form/form_builder.rb",
      "lib/simple_form/i18n_cache.rb",
      "lib/simple_form/inputs.rb",
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
      "test/components/hint_test.rb",
      "test/components/label_test.rb",
      "test/components/wrapper_test.rb",
+     "test/error_notification_test.rb",
      "test/form_builder_test.rb",
      "test/inputs_test.rb",
      "test/simple_form_test.rb",