diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb
index 6128f78..0f08264 100644
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -48,7 +48,7 @@ module Liquid
     end
     
     def strip_html(input)
-      input.to_s.gsub(/<.*?>/, '')
+      input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<.*?>/, '')
     end       
     
     # Remove all newlines from the string
diff --git a/test/standard_filter_test.rb b/test/standard_filter_test.rb
index 9c442e1..10944eb 100644
--- a/test/standard_filter_test.rb
+++ b/test/standard_filter_test.rb
@@ -57,6 +57,7 @@ class StandardFiltersTest < Test::Unit::TestCase
   def test_strip_html
     assert_equal 'test', @filters.strip_html("<div>test</div>")    
     assert_equal 'test', @filters.strip_html("<div id='test'>test</div>")    
+    assert_equal '', @filters.strip_html("<script type='text/javascript'>document.write('some stuff');</script>")    
     assert_equal '', @filters.strip_html(nil)    
   end