diff --git a/libsass.gyp b/libsass.gyp
index 3d113d69e..1a4b69b27 100644
--- a/libsass.gyp
+++ b/libsass.gyp
@@ -11,7 +11,8 @@
         'src/libsass/constants.cpp',
         'src/libsass/context.cpp',
         'src/libsass/contextualize.cpp',
-        'src/libsass/copy_c_str.cpp',
+        'src/libsass/cssize.cpp',
+        'src/libsass/emitter.cpp',
         'src/libsass/error_handling.cpp',
         'src/libsass/eval.cpp',
         'src/libsass/expand.cpp',
@@ -21,9 +22,10 @@
         'src/libsass/inspect.cpp',
         'src/libsass/json.cpp',
         'src/libsass/node.cpp',
-        'src/libsass/output_compressed.cpp',
-        'src/libsass/output_nested.cpp',
+        'src/libsass/output.cpp',
         'src/libsass/parser.cpp',
+        'src/libsass/plugins.cpp',
+        'src/libsass/position.cpp',
         'src/libsass/prelexer.cpp',
         'src/libsass/remove_placeholders.cpp',
         'src/libsass/sass.cpp',
diff --git a/src/binding.cpp b/src/binding.cpp
index 71dd1f18a..0d8e7ca44 100644
--- a/src/binding.cpp
+++ b/src/binding.cpp
@@ -272,7 +272,7 @@ NAN_METHOD(render_sync) {
 
   int result = get_result(ctx_w, ctx, true);
 
-  sass_wrapper_dispose(ctx_w, source_string);
+  sass_free_context_wrapper(ctx_w);
 
   NanReturnValue(NanNew<Boolean>(result == 0));
 }
diff --git a/src/libsass b/src/libsass
index 31521ef3e..62314f6a3 160000
--- a/src/libsass
+++ b/src/libsass
@@ -1 +1 @@
-Subproject commit 31521ef3ece636892f395a80392448ceae449b90
+Subproject commit 62314f6a3cbc7dbed3878884504847edd7fecb7b
diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map
index ad429779c..590b2eba4 100644
--- a/test/fixtures/source-map/expected.map
+++ b/test/fixtures/source-map/expected.map
@@ -5,6 +5,6 @@
 		"index.scss"
 	],
 	"sourcesContent": [],
-	"mappings": "AAAA;EACE,AAAO;EACP,AAAQ;;AAGV,AAAQ;EACN,AAAiB;;AAGnB,AAAQ;EACN,AAAO;EAET,AAAQ,AAAG;IACP,AAAa",
+	"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAI,GAFL;;AAKD,OAAO,CAAC,EAAE,CAAP;EACT,eAAe,EAAE,IAAK,GADZ;;AAIJ,OAAO,CAAC,EAAE,CAAP;EACT,KAAK,EAAE,IAAK,GADF;EAGV,OAAO,CAAC,EAAE,CAAC,CAAC,CAAV;IACA,WAAW,EAAE,IAAK,GADjB",
 	"names": []
 }
diff --git a/test/fixtures/spec b/test/fixtures/spec
index 3dc1f5758..4b5b1cf3a 160000
--- a/test/fixtures/spec
+++ b/test/fixtures/spec
@@ -1 +1 @@
-Subproject commit 3dc1f5758786627f41cebd275238d9224a593e5f
+Subproject commit 4b5b1cf3ae940964a52a1b8f06560f7a3aaf6d16
diff --git a/test/spec.js b/test/spec.js
index cbf5af079..1f2d26ff1 100644
--- a/test/spec.js
+++ b/test/spec.js
@@ -7,6 +7,7 @@ var assert = require('assert'),
     util = require('./util');
 
 describe('spec', function() {
+  this.timeout(0);
   var suites = util.getSuites();
 
   describe('test/sass-spec directory', function() {