diff --git a/jekyll.gemspec b/jekyll.gemspec
index 1608ce76..1a8f1c96 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll_test_plugin')
   s.add_development_dependency('jekyll_test_plugin_malicious')
   s.add_development_dependency('rouge', '~> 1.3')
+  s.add_development_dependency('sass', '~> 3.2')
 
   # = MANIFEST =
   s.files = %w[
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 4b45e2ba..02509040 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -27,6 +27,7 @@ require 'liquid'
 require 'maruku'
 require 'colorator'
 require 'toml'
+require 'sass'
 
 # internal requires
 require 'jekyll/core_ext'
diff --git a/lib/jekyll/converters/sass.rb b/lib/jekyll/converters/sass.rb
new file mode 100644
index 00000000..a5f34518
--- /dev/null
+++ b/lib/jekyll/converters/sass.rb
@@ -0,0 +1,18 @@
+module Jekyll
+  class Sass < Converter
+    safe true
+    priority :low
+
+    def matches(ext)
+      ext =~ /^\.sass$/i
+    end
+
+    def output_ext(ext)
+      ".css"
+    end
+
+    def convert(content)
+      Sass.compile(content, :syntax => :sass)
+    end
+  end
+end
diff --git a/lib/jekyll/converters/scss.rb b/lib/jekyll/converters/scss.rb
new file mode 100644
index 00000000..de7c097f
--- /dev/null
+++ b/lib/jekyll/converters/scss.rb
@@ -0,0 +1,18 @@
+module Jekyll
+  class Sass < Converter
+    safe true
+    priority :low
+
+    def matches(ext)
+      ext =~ /^\.sass$/i
+    end
+
+    def output_ext(ext)
+      ".css"
+    end
+
+    def convert(content)
+      Sass.compile(content, :syntax => :scss)
+    end
+  end
+end