diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index f5155dab..8b1ee7ba 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.1.1'
-  BOOTSTRAP_SHA = 'f9b88cbe9edbf3ab824ce2a3912a2943c3717e6d'
+  BOOTSTRAP_SHA = 'd6104b11511a69fb48d1e438141f135a14c04122'
 end
diff --git a/templates/project/_variables.sass.erb b/templates/project/_bootstrap-variables.sass.erb
similarity index 100%
rename from templates/project/_variables.sass.erb
rename to templates/project/_bootstrap-variables.sass.erb
diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb
index 77243d7b..cd2adce3 100644
--- a/templates/project/manifest.rb
+++ b/templates/project/manifest.rb
@@ -5,10 +5,10 @@ stylesheet 'styles.sass'
 
 # SCSS:
 
-assets = "../../vendor/assets"
+assets = '../../vendor/assets'
 
 bs_stylesheets = "#{assets}/stylesheets/bootstrap"
-stylesheet '_variables.sass.erb', :to => '_variables.sass', :erb => true,
+stylesheet '_bootstrap-variables.sass.erb', :to => '_bootstrap-variables.sass', :erb => true,
            :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
 
 # JS:
diff --git a/templates/project/styles.sass b/templates/project/styles.sass
index 1920a0d1..96dc2802 100644
--- a/templates/project/styles.sass
+++ b/templates/project/styles.sass
@@ -1,3 +1,3 @@
-// customize bootstrap variables here:
-@import "variables"
+@import "bootstrap-compass"
+@import "bootstrap-variables"
 @import "bootstrap"