gistfile1.diff

diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 9504b65..f84d8bf 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -129,7 +129,16 @@ module RailsGuides
     def initialize_dirs(output)
       @guides_dir = File.join(File.dirname(__FILE__), '..')
       @source_dir = "#@guides_dir/source/#@lang"
-      @output_dir = output || "#@guides_dir/output/#@lang"
+      @output_dir = if output
+        output
+      elsif @kindle
+        "#@guides_dir/output/kindle/#@lang"
+      else
+        "#@guides_dir/output/#@lang"
+      end
+          
     end
 
     def create_output_dir_if_needed
@@ -187,7 +196,7 @@ module RailsGuides
     def generate_guide(guide, output_file)
       output_path = output_path_for(output_file)
       puts "Generating #{guide} as #{output_file}"
-      layout = guide.start_with?('kindle/') ? 'kindle/layout' : 'layout'
+      layout = @kindle ? 'kindle/layout' : 'layout'
 
       File.open(output_path, 'w') do |f|
         view = ActionView::Base.new(source_dir, :version => @version)