diff --git a/package.json b/package.json
index 0a8089a47..c4b90887a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.13.1",
-  "libsass": "3.5.4",
+  "libsass": "3.6.3",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
diff --git a/src/libsass.gyp b/src/libsass.gyp
index add96e89a..813379fd2 100644
--- a/src/libsass.gyp
+++ b/src/libsass.gyp
@@ -11,12 +11,21 @@
          'DEBUG'
       ],
       'sources': [
+        'libsass/src/ast2c.cpp',
         'libsass/src/ast.cpp',
         'libsass/src/ast_fwd_decl.cpp',
+        'libsass/src/ast_sel_cmp.cpp',
+        'libsass/src/ast_selectors.cpp',
+        'libsass/src/ast_sel_super.cpp',
+        'libsass/src/ast_sel_unify.cpp',
+        'libsass/src/ast_sel_weave.cpp',
+        'libsass/src/ast_supports.cpp',
+        'libsass/src/ast_values.cpp',
         'libsass/src/backtrace.cpp',
         'libsass/src/base64vlq.cpp',
         'libsass/src/bind.cpp',
         'libsass/src/cencode.c',
+        'libsass/src/c2ast.cpp',
         'libsass/src/check_nesting.cpp',
         'libsass/src/color_maps.cpp',
         'libsass/src/constants.cpp',
@@ -26,37 +35,45 @@
         'libsass/src/environment.cpp',
         'libsass/src/error_handling.cpp',
         'libsass/src/eval.cpp',
+        'libsass/src/eval_selectors.cpp',
         'libsass/src/expand.cpp',
-        'libsass/src/extend.cpp',
+        'libsass/src/extender.cpp',
+        'libsass/src/extension.cpp',
         'libsass/src/file.cpp',
-        'libsass/src/functions.cpp',
+        'libsass/src/fn_colors.cpp',
+        'libsass/src/fn_lists.cpp',
+        'libsass/src/fn_maps.cpp',
+        'libsass/src/fn_miscs.cpp',
+        'libsass/src/fn_numbers.cpp',
+        'libsass/src/fn_selectors.cpp',
+        'libsass/src/fn_strings.cpp',
+        'libsass/src/fn_utils.cpp',
         'libsass/src/inspect.cpp',
         'libsass/src/json.cpp',
         'libsass/src/lexer.cpp',
         'libsass/src/listize.cpp',
         'libsass/src/memory/SharedPtr.cpp',
-        'libsass/src/node.cpp',
         'libsass/src/operators.cpp',
         'libsass/src/operators.hpp',
         'libsass/src/output.cpp',
         'libsass/src/parser.cpp',
+        'libsass/src/parser_selectors.cpp',
         'libsass/src/plugins.cpp',
         'libsass/src/position.cpp',
         'libsass/src/prelexer.cpp',
         'libsass/src/remove_placeholders.cpp',
-        'libsass/src/sass.cpp',
         'libsass/src/sass2scss.cpp',
         'libsass/src/sass_context.cpp',
+        'libsass/src/sass.cpp',
         'libsass/src/sass_functions.cpp',
-        'libsass/src/sass_util.cpp',
         'libsass/src/sass_values.cpp',
         'libsass/src/source_map.cpp',
-        'libsass/src/subset_map.cpp',
-        'libsass/src/to_c.cpp',
+        'libsass/src/stylesheet.cpp',
         'libsass/src/to_value.cpp',
         'libsass/src/units.cpp',
         'libsass/src/utf8_string.cpp',
         'libsass/src/util.cpp',
+        'libsass/src/util_string.cpp',
         'libsass/src/values.cpp'
       ],
       'cflags!': [