diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d2e2c843..3fab01d0 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -149,7 +149,9 @@ class ApplicationController < ActionController::Base
       @response.headers['Content-Type'] = 'text/xml; charset=UTF-8'
     elsif %w(tex).include?(action_name)
       @response.headers['Content-Type'] = 'text/plain; charset=UTF-8'
-    elsif @request.env['HTTP_USER_AGENT'] =~ /MathPlayer|Validator/ or @request.env.include?('HTTP_ACCEPT') && Mime::Type.parse(@request.env["HTTP_ACCEPT"]).include?(Mime::XHTML)
+    elsif @request.env['HTTP_USER_AGENT'] =~ /MathPlayer|Validator/ or @request.env.include?('HTTP_ACCEPT') &&
+           Mime::Type.parse(@request.env["HTTP_ACCEPT"]).include?(Mime::XHTML) && 
+           !(@request.env['HTTP_USER_AGENT'] =~ /Safari/ and  %w(s5).include?(action_name))
       @response.headers['Content-Type'] = 'application/xhtml+xml; charset=UTF-8'
     else
       @response.headers['Content-Type'] = 'text/html; charset=UTF-8'
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 7f759ff7..17d20044 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -293,10 +293,16 @@ class WikiController < ApplicationController
   end
 
   def s5
-    if @web.markup == :markdownMML or @web.markup == :markdown
-      @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F").to_ncr,
+    if @web.markup == :markdownMML
+      @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
            {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true,
-            :author => @page.author, :title => @page.plain_name}).to_s5)
+            :author => @page.author, :title => @page.plain_name}).to_s5).to_ncr
+    elsif @web.markup == :markdown
+      @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
+           {:math_enabled => false, :content_only => true,
+            :author => @page.author, :title => @page.plain_name}).to_s5).to_ncr
+    else
+      @s5_content = "S5 not supported with this text filter"
     end
   end
 
diff --git a/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb b/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb
index bd055a20..a94ad14e 100644
--- a/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb
+++ b/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb
@@ -42,7 +42,7 @@ module MaRuKu
 		dummy_layout_slide = 
 		"
 		<div class='layout'>
-		<div id='controls'></div>
+		<div id='controls'> </div>
 		<div id='currentSlide'> </div>
 		<div id='header'> #{slide_header}</div>
 		<div id='footer'>