diff --git a/src/libsass b/src/libsass
index f47645c2e..bc1e6db31 160000
--- a/src/libsass
+++ b/src/libsass
@@ -1 +1 @@
-Subproject commit f47645c2ebb98c9e0c970f59820b239ab417dda3
+Subproject commit bc1e6db3117d4769023a92344cd7f48dfddd4972
diff --git a/src/libsass.gyp b/src/libsass.gyp
index 16a2eaf85..c5fb3be5d 100644
--- a/src/libsass.gyp
+++ b/src/libsass.gyp
@@ -48,7 +48,6 @@
         'libsass/src/sass_values.cpp',
         'libsass/src/source_map.cpp',
         'libsass/src/to_c.cpp',
-        'libsass/src/to_string.cpp',
         'libsass/src/to_value.cpp',
         'libsass/src/units.cpp',
         'libsass/src/utf8_string.cpp',
diff --git a/test/fixtures/source-map-embed/expected.css b/test/fixtures/source-map-embed/expected.css
index b290067da..827bc93a5 100644
--- a/test/fixtures/source-map-embed/expected.css
+++ b/test/fixtures/source-map-embed/expected.css
@@ -10,4 +10,4 @@
   #navbar li a {
     font-weight: bold; }
 
-/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZml4dHVyZXMvc291cmNlLW1hcC1lbWJlZC9pbmRleC5jc3MiLAoJInNvdXJjZXMiOiBbCgkJImZpeHR1cmVzL3NvdXJjZS1tYXAtZW1iZWQvaW5kZXguc2NzcyIKCV0sCgkibWFwcGluZ3MiOiAiQUFBQSxPQUFPLENBQUM7RUFDTixLQUFLLEVBQUUsR0FBSTtFQUNYLE1BQU0sRUFBRSxJQUFLLEdBQ2Q7O0FBRUQsT0FBTyxDQUFDLEVBQUUsQ0FBQztFQUNULGVBQWUsRUFBRSxJQUFLLEdBQ3ZCOztBQUVELE9BQU8sQ0FBQyxFQUFFLENBQUM7RUFDVCxLQUFLLEVBQUUsSUFBSyxHQUtiO0VBTkQsT0FBTyxDQUFDLEVBQUUsQ0FHUixDQUFDLENBQUM7SUFDQSxXQUFXLEVBQUUsSUFBSyxHQUNuQiIsCgkibmFtZXMiOiBbXQp9 */
\ No newline at end of file
+/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiZml4dHVyZXMvc291cmNlLW1hcC1lbWJlZC9pbmRleC5jc3MiLAoJInNvdXJjZXMiOiBbCgkJImZpeHR1cmVzL3NvdXJjZS1tYXAtZW1iZWQvaW5kZXguc2NzcyIKCV0sCgkibWFwcGluZ3MiOiAiQUFBQSxBQUFBLE9BQU8sQ0FBQztFQUNOLEtBQUssRUFBRSxHQUFJO0VBQ1gsTUFBTSxFQUFFLElBQUssR0FDZDs7QUFFRCxBQUFRLE9BQUQsQ0FBQyxFQUFFLENBQUM7RUFDVCxlQUFlLEVBQUUsSUFBSyxHQUN2Qjs7QUFFRCxBQUFRLE9BQUQsQ0FBQyxFQUFFLENBQUM7RUFDVCxLQUFLLEVBQUUsSUFBSyxHQUtiO0VBTkQsQUFHRSxPQUhLLENBQUMsRUFBRSxDQUdSLENBQUMsQ0FBQztJQUNBLFdBQVcsRUFBRSxJQUFLLEdBQ25CIiwKCSJuYW1lcyI6IFtdCn0= */
diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map
index 924fd7bda..ca712367e 100644
--- a/test/fixtures/source-map/expected.map
+++ b/test/fixtures/source-map/expected.map
@@ -4,6 +4,6 @@
 	"sources": [
 		"index.scss"
 	],
-	"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAK,GACd;;AAED,OAAO,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAK,GACvB;;AAED,OAAO,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAK,GAKb;EAND,OAAO,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAK,GACnB",
+	"mappings": "AAAA,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAK,GACd;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAK,GACvB;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAK,GAKb;EAND,AAGE,OAHK,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAK,GACnB",
 	"names": []
 }
diff --git a/test/fixtures/spec b/test/fixtures/spec
index b089cff39..daff4d6ac 160000
--- a/test/fixtures/spec
+++ b/test/fixtures/spec
@@ -1 +1 @@
-Subproject commit b089cff39e623de5c6d3c88ad021220df5c67657
+Subproject commit daff4d6ac54d90151d13e65e0d2f1a0c73a8f267