diff --git a/glide.lock b/glide.lock
index 3bd4d1d39..79052cc41 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 041486e116f9792e4533a4a67b191ab139d29ea4449d4b6eb6e2d96b620b3cac
-updated: 2016-10-03T20:28:56.472755464-06:00
+hash: 59cc65f24ef42bcc96a5e5f660dd79cff89aa53040a561c47b629f1d55397424
+updated: 2016-10-05T17:24:13.347058671-06:00
 imports:
 - name: bitbucket.org/ww/goautoneg
   version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
diff --git a/glide.yaml b/glide.yaml
index 5439b4341..663c3fd47 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,7 +9,7 @@ import:
   version: 367864438f1b1a3c7db4da06a2f55b144e6784e0
 - package: github.com/Masterminds/sprig
   version: ^2.6
-- package: gopkg.in/yaml.v2
+- package: github.com/ghodss/yaml
 - package: github.com/Masterminds/semver
   version: 1.1.0
 - package: github.com/technosophos/moniker
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 10badbcfc..dd36e5621 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -27,7 +27,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"gopkg.in/yaml.v2"
+	"github.com/ghodss/yaml"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/engine"
 	"k8s.io/helm/pkg/lint/support"
diff --git a/pkg/repo/index.go b/pkg/repo/index.go
index 0c8a9436f..9fe08b7e0 100644
--- a/pkg/repo/index.go
+++ b/pkg/repo/index.go
@@ -166,10 +166,10 @@ func (i IndexFile) WriteFile(dest string, mode os.FileMode) error {
 // ChartVersion represents a chart entry in the IndexFile
 type ChartVersion struct {
 	*chart.Metadata
-	URLs    []string  `yaml:"url" json:"urls"`
-	Created time.Time `yaml:"created,omitempty" json:"created,omitempty"`
-	Removed bool      `yaml:"removed,omitempty" json:"removed,omitempty"`
-	Digest  string    `yaml:"digest,omitempty" json:"digest,omitempty"`
+	URLs    []string  `json:"urls"`
+	Created time.Time `json:"created,omitempty"`
+	Removed bool      `json:"removed,omitempty"`
+	Digest  string    `json:"digest,omitempty"`
 }
 
 // IndexDirectory reads a (flat) directory and generates an index.