diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index f5f8e3296a8f766096812edcbb0c13e5143b1f75..043b9edfa3a7afd7ae8c89f78cb968809f3f635d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added support for a -h/--help parameter in the generator #331 [Ulysses]
+
 * File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin].
 
 
diff --git a/railties/bin/generate b/railties/bin/generate
index 8f2f1497d659fb0688717dbeceb46df1c2158043..1588a306da513022af59efe9ac63f96935889837 100755
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -2,6 +2,8 @@
 require File.dirname(__FILE__) + '/../config/environment'
 require 'rails_generator'
 
+ARGV.shift unless ARGV.empty? or not ['--help', '-h'].include?(ARGV[0])
+
 unless ARGV.empty?
   begin
     name = ARGV.shift