diff --git a/cmd/helm/testdata/output/status.yaml b/cmd/helm/testdata/output/status.yaml
index a3990a954..969bfb26f 100644
--- a/cmd/helm/testdata/output/status.yaml
+++ b/cmd/helm/testdata/output/status.yaml
@@ -1,7 +1,7 @@
 info:
-  deleted: 0001-01-01T00:00:00Z
-  first_deployed: 0001-01-01T00:00:00Z
-  last_deployed: 2016-01-16T00:00:00Z
+  deleted: "0001-01-01T00:00:00Z"
+  first_deployed: "0001-01-01T00:00:00Z"
+  last_deployed: "2016-01-16T00:00:00Z"
   resources: |
     resource A
     resource B
diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go
index 17ffed330..63ce007c6 100644
--- a/pkg/releaseutil/manifest_sorter.go
+++ b/pkg/releaseutil/manifest_sorter.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
-	yaml "gopkg.in/yaml.v2"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/hapi/release"
 	"k8s.io/helm/pkg/hooks"