diff --git a/data_navigator.go b/data_navigator.go
index 44460353..d47fa4b2 100644
--- a/data_navigator.go
+++ b/data_navigator.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/mikefarah/yaml.v2"
 )
 
 func entryInSlice(context yaml.MapSlice, key interface{}) *yaml.MapItem {
diff --git a/data_navigator_test.go b/data_navigator_test.go
index daae8798..9a3fce08 100644
--- a/data_navigator_test.go
+++ b/data_navigator_test.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"testing"
 
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/mikefarah/yaml.v2"
 )
 
 func TestReadMap_simple(t *testing.T) {
diff --git a/json_converter.go b/json_converter.go
index 566bdc9b..a3f79df1 100644
--- a/json_converter.go
+++ b/json_converter.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/mikefarah/yaml.v2"
 )
 
 func jsonToString(context interface{}) (string, error) {
diff --git a/utils_test.go b/utils_test.go
index 0828cb2e..74ac9b0d 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/spf13/cobra"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/mikefarah/yaml.v2"
 )
 
 type resulter struct {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 5dba65d1..d18f52e8 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -39,12 +39,10 @@
 			"revisionTime": "2017-08-24T17:57:12Z"
 		},
 		{
-			"checksumSHA1": "DHNYKS5T54/XOqUsFFzdZMLEnVE=",
-			"origin": "github.com/mikefarah/yaml",
-			"path": "gopkg.in/yaml.v2",
+			"checksumSHA1": "7wtGubs4v7+RZovtlmyT9KwA/gE=",
+			"path": "gopkg.in/mikefarah/yaml.v2",
 			"revision": "e175af14aaa1d0eff2ee04b691e4a4827a111416",
-			"revisionTime": "2018-06-13T04:05:11Z",
-			"tree": true
+			"revisionTime": "2018-06-13T04:05:11Z"
 		}
 	],
 	"rootPath": "github.com/mikefarah/yq"
diff --git a/yq.go b/yq.go
index 8ee346a7..52644df7 100644
--- a/yq.go
+++ b/yq.go
@@ -14,7 +14,7 @@ import (
 
 	logging "github.com/op/go-logging"
 	"github.com/spf13/cobra"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/mikefarah/yaml.v2"
 )
 
 var trimOutput = true