diff --git a/.gitignore b/.gitignore
index f37c077..965edff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sass-3.1.4.gem
 /sass-3.1.7.gem
+/sass-3.1.20.gem
diff --git a/rubygem-sass-3.1.4-fix-cache_stores-require.patch b/rubygem-sass-3.1.4-fix-cache_stores-require.patch
deleted file mode 100644
index dfee635..0000000
--- a/rubygem-sass-3.1.4-fix-cache_stores-require.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/sass/plugin/configuration.rb.orig	2011-07-22 11:15:09.637534542 -0400
-+++ lib/sass/plugin/configuration.rb	2011-07-22 11:15:20.787619673 -0400
-@@ -2,6 +2,8 @@
- # so that we can load it independently in Rails 3,
- # where the full plugin stuff is lazy-loaded.
- 
-+require 'sass/cache_stores'
-+
- module Sass
-   module Plugin
-     module Configuration
diff --git a/rubygem-sass-3.1.4-fix-util-require.patch b/rubygem-sass-3.1.4-fix-util-require.patch
deleted file mode 100644
index d1f64ad..0000000
--- a/rubygem-sass-3.1.4-fix-util-require.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/sass/plugin/compiler.rb.orig	2011-07-22 11:14:18.908146980 -0400
-+++ lib/sass/plugin/compiler.rb	2011-07-22 11:14:31.275241499 -0400
-@@ -1,6 +1,7 @@
- require 'fileutils'
- 
- require 'sass'
-+require 'sass/util'
- # XXX CE: is this still necessary now that we have the compiler class?
- require 'sass/callbacks'
- require 'sass/plugin/configuration'
diff --git a/rubygem-sass.spec b/rubygem-sass.spec
index 5eca3a8..22dd3f2 100644
--- a/rubygem-sass.spec
+++ b/rubygem-sass.spec
@@ -5,15 +5,12 @@
 
 Summary: A powerful but elegant CSS compiler that makes CSS fun again
 Name: rubygem-%{gem_name}
-Version: 3.1.7
-Release: 7%{?dist}
+Version: 3.1.20
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://sass-lang.com/
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Patch1: rubygem-sass-3.1.4-fix-util-require.patch
-Patch2: rubygem-sass-3.1.4-fix-cache_stores-require.patch
-Patch3: sass-3.1.7-tests-fix.patch
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: rubygem(fssm)
@@ -49,11 +46,10 @@ gem install --local --install-dir .%{gem_dir} --bindir .%{_bindir} \
             --force %{SOURCE0}
 
 pushd .%{gem_instdir}
-rm .yardopts
+# Remove bundled rubygem-listener:
+# https://github.com/nex3/sass/issues/458
 rm -rf vendor
-%patch1
-%patch2
-%patch3
+popd
 
 %build
 
@@ -67,18 +63,19 @@ cp -a .%{_bindir}/* %{buildroot}%{_bindir}/
 find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 %check
-pushd %{buildroot}%{gem_instdir}
+pushd .%{gem_instdir}
 export LANG=en_US.utf8
 find -type f -name *_test.rb | xargs testrb -Itest
-rm -rf .sass-cache
 popd
 
 %files
 %dir %{gem_instdir}
 %{_bindir}/sass
 %{_bindir}/sass-convert
+%{_bindir}/scss
 %{gem_instdir}/bin
 %{gem_libdir}
+%exclude %{gem_instdir}/.*
 %{gem_instdir}/init.rb
 %{gem_instdir}/rails/init.rb
 %{gem_instdir}/extra/update_watch.rb
@@ -87,17 +84,20 @@ popd
 %doc %{gem_instdir}/MIT-LICENSE
 %doc %{gem_instdir}/CONTRIBUTING
 %doc %{gem_instdir}/README.md
-%doc %{gem_instdir}/test
-%doc %{gem_instdir}/Rakefile
 %doc %{gem_instdir}/REVISION
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
 %doc %{gem_docdir}
+%{gem_instdir}/Rakefile
+%{gem_instdir}/test
 
 
 %changelog
+* Mon Jul 23 2012 Vít Ondruch <vondruch@redhat.com> - 3.1.20-1
+- Update to sass 3.1.20.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sass-3.1.7-tests-fix.patch b/sass-3.1.7-tests-fix.patch
deleted file mode 100644
index 256640d..0000000
--- a/sass-3.1.7-tests-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- test/sass/scss/scss_test.rb.orig	2011-09-28 11:19:05.000000000 -0400
-+++ test/sass/scss/scss_test.rb	2011-09-28 11:19:22.000000000 -0400
-@@ -118,11 +118,11 @@ SCSS
-   def test_warn_directive
-     expected_warning = <<EXPECTATION
- WARNING: this is a warning
--        on line 2 of test_warn_directive_inline.scss
-+         on line 2 of test_warn_directive_inline.scss
- 
- WARNING: this is a mixin
--        on line 1 of test_warn_directive_inline.scss, in `foo'
--        from line 3 of test_warn_directive_inline.scss
-+         on line 1 of test_warn_directive_inline.scss, in `foo'
-+         from line 3 of test_warn_directive_inline.scss
- EXPECTATION
-     assert_warning expected_warning do
-       assert_equal <<CSS, render(<<SCSS)
diff --git a/sources b/sources
index e872a90..3a109ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ddaa60fae07996b82d562df87104f4f  sass-3.1.7.gem
+8d6733500d0c34b7e1d7c20e1c581fcc  sass-3.1.20.gem