diff --git a/padrino-core/lib/padrino-core/cli/base.rb b/padrino-core/lib/padrino-core/cli/base.rb
index 7f715612b..0f6a10b09 100644
--- a/padrino-core/lib/padrino-core/cli/base.rb
+++ b/padrino-core/lib/padrino-core/cli/base.rb
@@ -62,7 +62,7 @@ def console
         require File.expand_path(File.dirname(__FILE__) + '/console')
         IRB.start
       end
-      
+
       desc "generate", "Executes the Padrino generator with given options."
       def generate(*args)
         # Build Padrino g as an alias of padrino-gen
@@ -78,6 +78,10 @@ def generate(*args)
           puts "<= You need padrino-gen! Run: gem install padrino-gen"
         end
       end
+      desc "g", "Executes the Padrino generator with given options."
+      alias :g :generate
+      desc "gen", "Executes the Padrino generator with given options."
+      alias :gen :generate
 
       desc "version", "Show current Padrino Version"
       map "-v" => :version, "--version" => :version