diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34b4f8b16..faa5632b3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ The Kubernetes Helm project accepts contributions via GitHub pull requests. This
 ## Reporting a Security Issue
 
 Most of the time, when you find a bug in Helm, it should be reported
-using [GitHub issues](https://github.com/kubernetes/helm/issues). However, if
+using [GitHub issues](https://github.com/helm/helm/issues). However, if
 you are reporting a _security vulnerability_, please email a report to
 [helm-security@deis.com](mailto:helm-security@deis.com). This will give
 us a chance to try to fix the issue before it is exploited in the wild.
@@ -30,7 +30,7 @@ apply to [third_party](third_party/) and [vendor](vendor/).
 
 Whether you are a user or contributor, official support channels include:
 
-- GitHub [issues](https://github.com/kubernetes/helm/issues/new)
+- GitHub [issues](https://github.com/helm/helm/issues/new)
 - Slack: #Helm room in the [Kubernetes Slack](http://slack.kubernetes.io/)
 
 Before opening a new issue or submitting a new pull request, it's helpful to search the project - it's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
@@ -121,7 +121,7 @@ contributing to Helm. All issue types follow the same general lifecycle. Differe
 3. Submit a pull request.
 
 Coding conventions and standards are explained in the official developer docs:
-https://github.com/kubernetes/helm/blob/master/docs/developers.md
+https://github.com/helm/helm/blob/master/docs/developers.md
 
 The next section contains more information on the workflow followed for PRs
 
diff --git a/README.md b/README.md
index bbf6f2d05..aeb501d90 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ pre-configured Kubernetes resources.
 
 Use Helm to:
 
-- Find and use [popular software packaged as Kubernetes charts](https://github.com/kubernetes/charts)
+- Find and use [popular software packaged as Kubernetes charts](https://github.com/helm/charts)
 - Share your own applications as Kubernetes charts
 - Create reproducible builds of your Kubernetes applications
 - Intelligently manage your Kubernetes manifest files
@@ -56,7 +56,7 @@ Get started with the [Quick Start guide](https://docs.helm.sh/using_helm/#quicks
 
 ## Roadmap
 
-The [Helm roadmap uses Github milestones](https://github.com/kubernetes/helm/milestones) to track the progress of the project.
+The [Helm roadmap uses Github milestones](https://github.com/helm/helm/milestones) to track the progress of the project.
 
 ## Community, discussion, contribution, and support
 
diff --git a/cmd/helm/history.go b/cmd/helm/history.go
index 5b3094e2a..2dd47b17a 100644
--- a/cmd/helm/history.go
+++ b/cmd/helm/history.go
@@ -164,7 +164,7 @@ func formatAsTable(releases releaseHistory, colWidth uint) []byte {
 func formatChartname(c *chart.Chart) string {
 	if c == nil || c.Metadata == nil {
 		// This is an edge case that has happened in prod, though we don't
-		// know how: https://github.com/kubernetes/helm/issues/1347
+		// know how: https://github.com/helm/helm/issues/1347
 		return "MISSING"
 	}
 	return fmt.Sprintf("%s-%s", c.Name(), c.Metadata.Version)
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 09b1bec51..da980615a 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -228,7 +228,7 @@ func (o *installOptions) run(out io.Writer) error {
 	if req := chartRequested.Metadata.Requirements; req != nil {
 		// If checkDependencies returns an error, we have unfulfilled dependencies.
 		// As of Helm 2.4.0, this is treated as a stopping condition:
-		// https://github.com/kubernetes/helm/issues/2209
+		// https://github.com/helm/helm/issues/2209
 		if err := checkDependencies(chartRequested, req); err != nil {
 			if o.depUp {
 				man := &downloader.Manager{
diff --git a/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml b/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml
index 96c98c38c..e18e90d29 100644
--- a/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml
+++ b/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml
@@ -6,7 +6,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.1.0
       appVersion: 1.2.3
       description: Deploy a basic Alpine Linux pod
@@ -19,7 +19,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.2.0
       appVersion: 2.3.4
       description: Deploy a basic Alpine Linux pod
diff --git a/cmd/helm/testdata/testcharts/alpine/Chart.yaml b/cmd/helm/testdata/testcharts/alpine/Chart.yaml
index 6fbb27f18..fea865aa5 100644
--- a/cmd/helm/testdata/testcharts/alpine/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/alpine/Chart.yaml
@@ -2,5 +2,5 @@ description: Deploy a basic Alpine Linux pod
 home: https://k8s.io/helm
 name: alpine
 sources:
-- https://github.com/kubernetes/helm
+- https://github.com/helm/helm
 version: 0.1.0
diff --git a/cmd/helm/testdata/testcharts/issue1979/Chart.yaml b/cmd/helm/testdata/testcharts/issue1979/Chart.yaml
index 6fbb27f18..fea865aa5 100644
--- a/cmd/helm/testdata/testcharts/issue1979/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/issue1979/Chart.yaml
@@ -2,5 +2,5 @@ description: Deploy a basic Alpine Linux pod
 home: https://k8s.io/helm
 name: alpine
 sources:
-- https://github.com/kubernetes/helm
+- https://github.com/helm/helm
 version: 0.1.0
diff --git a/cmd/helm/testdata/testcharts/novals/Chart.yaml b/cmd/helm/testdata/testcharts/novals/Chart.yaml
index ce1a81da6..85f7a5d83 100644
--- a/cmd/helm/testdata/testcharts/novals/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/novals/Chart.yaml
@@ -2,5 +2,5 @@ description: Deploy a basic Alpine Linux pod
 home: https://k8s.io/helm
 name: novals
 sources:
-- https://github.com/kubernetes/helm
+- https://github.com/helm/helm
 version: 0.2.0
diff --git a/cmd/helm/testdata/testcharts/signtest/alpine/Chart.yaml b/cmd/helm/testdata/testcharts/signtest/alpine/Chart.yaml
index 6fbb27f18..fea865aa5 100644
--- a/cmd/helm/testdata/testcharts/signtest/alpine/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/signtest/alpine/Chart.yaml
@@ -2,5 +2,5 @@ description: Deploy a basic Alpine Linux pod
 home: https://k8s.io/helm
 name: alpine
 sources:
-- https://github.com/kubernetes/helm
+- https://github.com/helm/helm
 version: 0.1.0
diff --git a/docs/chart_repository.md b/docs/chart_repository.md
index 01d457e63..d015dcb4a 100644
--- a/docs/chart_repository.md
+++ b/docs/chart_repository.md
@@ -5,7 +5,7 @@ high level, a chart repository is a location where packaged charts can be
 stored and shared.
 
 The official chart repository is maintained by the
-[Kubernetes Charts](https://github.com/kubernetes/charts), and we welcome
+[Kubernetes Charts](https://github.com/helm/charts), and we welcome
 participation. But Helm also makes it easy to create and run your own chart
 repository. This guide explains how to do so.
 
@@ -21,7 +21,7 @@ optionally some packaged charts.  When you're ready to share your charts, the
 preferred way to do so is by uploading them to a chart repository.
 
 **Note:** For Helm 2.0.0, chart repositories do not have any intrinsic
-authentication. There is an [issue tracking progress](https://github.com/kubernetes/helm/issues/1038)
+authentication. There is an [issue tracking progress](https://github.com/helm/helm/issues/1038)
 in GitHub.
 
 Because a chart repository can be any HTTP server that can serve YAML and tar
@@ -78,7 +78,7 @@ entries:
       home: https://k8s.io/helm
       name: alpine
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       urls:
       - https://technosophos.github.io/tscharts/alpine-0.2.0.tgz
       version: 0.2.0
@@ -88,7 +88,7 @@ entries:
       home: https://k8s.io/helm
       name: alpine
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       urls:
       - https://technosophos.github.io/tscharts/alpine-0.1.0.tgz
       version: 0.1.0
@@ -99,7 +99,7 @@ entries:
       home: https://k8s.io/helm
       name: nginx
       sources:
-      - https://github.com/kubernetes/charts
+      - https://github.com/helm/charts
       urls:
       - https://technosophos.github.io/tscharts/nginx-1.1.0.tgz
       version: 1.1.0
@@ -143,7 +143,7 @@ Congratulations, now you have an empty GCS bucket ready to serve charts!
 You may upload your chart repository using the Google Cloud Storage command line
 tool, or using the GCS web UI. This is the technique the official Kubernetes
 Charts repository hosts its charts, so you may want to take a
-[peek at that project](https://github.com/kubernetes/charts) if you get stuck.
+[peek at that project](https://github.com/helm/charts) if you get stuck.
 
 **Note:** A public GCS bucket can be accessed via simple HTTPS at this address
 `https://bucket-name.storage.googleapis.com/`.
diff --git a/docs/chart_repository_faq.md b/docs/chart_repository_faq.md
index 2b01612e9..5d2366c9f 100644
--- a/docs/chart_repository_faq.md
+++ b/docs/chart_repository_faq.md
@@ -3,7 +3,7 @@
 This section tracks some of the more frequently encountered issues with using chart repositories.
 
 **We'd love your help** making this document better. To add, correct, or remove
-information, [file an issue](https://github.com/kubernetes/helm/issues) or
+information, [file an issue](https://github.com/helm/helm/issues) or
 send us a pull request.
 
 ## Pulling
diff --git a/docs/chart_template_guide/builtin_objects.md b/docs/chart_template_guide/builtin_objects.md
index 267b3cac4..c24fd4b08 100644
--- a/docs/chart_template_guide/builtin_objects.md
+++ b/docs/chart_template_guide/builtin_objects.md
@@ -12,7 +12,7 @@ In the previous section, we use `{{.Release.Name}}` to insert the name of a rele
   - `Release.IsInstall`: This is set to `true` if the current operation is an install.
 - `Values`: Values passed into the template from the `values.yaml` file and from user-supplied files. By default, `Values` is empty.
 - `Chart`: The contents of the `Chart.yaml` file. Any data in `Chart.yaml` will be accessible here. For example `{{.Chart.Name}}-{{.Chart.Version}}` will print out the `mychart-0.1.0`.
-  - The available fields are listed in the [Charts Guide](https://github.com/kubernetes/helm/blob/master/docs/charts.md#the-chartyaml-file)
+  - The available fields are listed in the [Charts Guide](https://github.com/helm/helm/blob/master/docs/charts.md#the-chartyaml-file)
 - `Files`: This provides access to all non-special files in a chart. While you cannot use it to access templates, you can use it to access other files in the chart. See the section _Accessing Files_ for more.
   - `Files.Get` is a function for getting a file by name (`.Files.Get config.ini`)
   - `Files.GetBytes` is a function for getting the contents of a file as an array of bytes instead of as a string. This is useful for things like images.
@@ -27,5 +27,5 @@ In the previous section, we use `{{.Release.Name}}` to insert the name of a rele
 
 The values are available to any top-level template. As we will see later, this does not necessarily mean that they will be available _everywhere_.
 
-The built-in values always begin with a capital letter. This is in keeping with Go's naming convention. When you create your own names, you are free to use a convention that suits your team. Some teams, like the [Kubernetes Charts](https://github.com/kubernetes/charts) team, choose to use only initial lower case letters in order to distinguish local names from those built-in. In this guide, we follow that convention.
+The built-in values always begin with a capital letter. This is in keeping with Go's naming convention. When you create your own names, you are free to use a convention that suits your team. Some teams, like the [Kubernetes Charts](https://github.com/helm/charts) team, choose to use only initial lower case letters in order to distinguish local names from those built-in. In this guide, we follow that convention.
 
diff --git a/docs/chart_template_guide/wrapping_up.md b/docs/chart_template_guide/wrapping_up.md
index 1ed7c602a..5c5f3282f 100755
--- a/docs/chart_template_guide/wrapping_up.md
+++ b/docs/chart_template_guide/wrapping_up.md
@@ -4,7 +4,7 @@ This guide is intended to give you, the chart developer, a strong understanding
 
 But there are many things this guide has not covered when it comes to the practical day-to-day development of charts. Here are some useful pointers to other documentation that will help you as you create new charts:
 
-- The [Kubernetes Charts project](https://github.com/kubernetes/charts) is an indispensable source of charts. That project is also sets the standard for best practices in chart development.
+- The [Kubernetes Charts project](https://github.com/helm/charts) is an indispensable source of charts. That project is also sets the standard for best practices in chart development.
 - The Kubernetes [User's Guide](http://kubernetes.io/docs/user-guide/) provides detailed examples of the various resource kinds that you can use, from ConfigMaps and Secrets to DaemonSets and Deployments.
 - The Helm [Charts Guide](../charts.md) explains the workflow of using charts.
 - The Helm [Chart Hooks Guide](../charts_hooks.md) explains how to create lifecycle hooks.
@@ -17,4 +17,4 @@ Sometimes it's easier to ask a few questions and get answers from experienced de
 
 - [Kubernetes Slack](https://slack.k8s.io/): `#helm`
 
-Finally, if you find errors or omissions in this document, want to suggest some new content, or would like to contribute, visit [The Helm Project](https://github.com/kubernetes/helm).
+Finally, if you find errors or omissions in this document, want to suggest some new content, or would like to contribute, visit [The Helm Project](https://github.com/helm/helm).
diff --git a/docs/charts.md b/docs/charts.md
index b572b65a1..6c5263c1e 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -112,7 +112,7 @@ to mark a chart as deprecated. If the **latest** version of a chart in the
 repository is marked as deprecated, then the chart as a whole is considered to
 be deprecated. The chart name can later be reused by publishing a newer version
 that is not marked as deprecated. The workflow for deprecating charts, as
-followed by the [kubernetes/charts](https://github.com/kubernetes/charts)
+followed by the [kubernetes/charts](https://github.com/helm/charts)
 project is:
   - Update chart's `Chart.yaml` to mark the chart as deprecated, bumping the
   version
@@ -560,7 +560,7 @@ All of these values are defined by the template author. Helm does not
 require or dictate parameters.
 
 To see many working charts, check out the [Kubernetes Charts
-project](https://github.com/kubernetes/charts)
+project](https://github.com/helm/charts)
 
 ### Predefined Values
 
diff --git a/docs/charts_tips_and_tricks.md b/docs/charts_tips_and_tricks.md
index 705cd42fe..14a70a138 100644
--- a/docs/charts_tips_and_tricks.md
+++ b/docs/charts_tips_and_tricks.md
@@ -193,7 +193,7 @@ by convention, helper templates and partials are placed in a
 
 ## Complex Charts with Many Dependencies
 
-Many of the charts in the [official charts repository](https://github.com/kubernetes/charts)
+Many of the charts in the [official charts repository](https://github.com/helm/charts)
 are "building blocks" for creating more advanced applications. But charts may be
 used to create instances of large-scale applications. In such cases, a single
 umbrella chart may have multiple subcharts, each of which functions as a piece
diff --git a/docs/developers.md b/docs/developers.md
index 8430babeb..622834686 100644
--- a/docs/developers.md
+++ b/docs/developers.md
@@ -69,7 +69,7 @@ elegant and high-quality open source code so that our users will benefit.
 
 Make sure you have read and understood the main CONTRIBUTING guide:
 
-https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md
+https://github.com/helm/helm/blob/master/CONTRIBUTING.md
 
 ### Structure of the Code
 
diff --git a/docs/examples/alpine/Chart.yaml b/docs/examples/alpine/Chart.yaml
index f4b660d4f..e56f8a469 100644
--- a/docs/examples/alpine/Chart.yaml
+++ b/docs/examples/alpine/Chart.yaml
@@ -1,7 +1,7 @@
 name: alpine
 description: Deploy a basic Alpine Linux pod
 version: 0.1.0
-home: https://github.com/kubernetes/helm
+home: https://github.com/helm/helm
 sources:
-  - https://github.com/kubernetes/helm
+  - https://github.com/helm/helm
 appVersion: 3.3
diff --git a/docs/examples/nginx/Chart.yaml b/docs/examples/nginx/Chart.yaml
index 807455210..3d6f5751b 100644
--- a/docs/examples/nginx/Chart.yaml
+++ b/docs/examples/nginx/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
   - nginx
   - www
   - web
-home: https://github.com/kubernetes/helm
+home: https://github.com/helm/helm
 sources:
   - https://hub.docker.com/_/nginx/
 maintainers:
diff --git a/docs/examples/nginx/charts/alpine/Chart.yaml b/docs/examples/nginx/charts/alpine/Chart.yaml
index f4b660d4f..e56f8a469 100644
--- a/docs/examples/nginx/charts/alpine/Chart.yaml
+++ b/docs/examples/nginx/charts/alpine/Chart.yaml
@@ -1,7 +1,7 @@
 name: alpine
 description: Deploy a basic Alpine Linux pod
 version: 0.1.0
-home: https://github.com/kubernetes/helm
+home: https://github.com/helm/helm
 sources:
-  - https://github.com/kubernetes/helm
+  - https://github.com/helm/helm
 appVersion: 3.3
diff --git a/docs/install.md b/docs/install.md
index 6e07c00b8..bf181d64c 100755
--- a/docs/install.md
+++ b/docs/install.md
@@ -10,11 +10,11 @@ Helm can be installed either from source, or from pre-built binary releases.
 
 ### From the Binary Releases
 
-Every [release](https://github.com/kubernetes/helm/releases) of Helm
+Every [release](https://github.com/helm/helm/releases) of Helm
 provides binary releases for a variety of OSes. These binary versions
 can be manually downloaded and installed.
 
-1. Download your [desired version](https://github.com/kubernetes/helm/releases)
+1. Download your [desired version](https://github.com/helm/helm/releases)
 2. Unpack it (`tar -zxvf helm-v2.0.0-linux-amd64.tgz`)
 3. Find the `helm` binary in the unpacked directory, and move it to its
    desired destination (`mv linux-amd64/helm /usr/local/bin/helm`)
@@ -84,7 +84,7 @@ You must have a working Go environment with
 $ cd $GOPATH
 $ mkdir -p src/k8s.io
 $ cd src/k8s.io
-$ git clone https://github.com/kubernetes/helm.git
+$ git clone https://github.com/helm/helm.git
 $ cd helm
 $ make bootstrap build
 ```
diff --git a/docs/install_faq.md b/docs/install_faq.md
index d7b6150fa..3bf15e86d 100644
--- a/docs/install_faq.md
+++ b/docs/install_faq.md
@@ -4,7 +4,7 @@ This section tracks some of the more frequently encountered issues with installi
 or getting started with Helm.
 
 **We'd love your help** making this document better. To add, correct, or remove
-information, [file an issue](https://github.com/kubernetes/helm/issues) or
+information, [file an issue](https://github.com/helm/helm/issues) or
 send us a pull request.
 
 ## Downloading
@@ -74,7 +74,7 @@ follows. On each of the control plane nodes:
 3) Remove the k8s api server container (kubelet will recreate it)
 4) Then `systemctl restart docker` (or reboot the node) for it to pick up the /etc/resolv.conf changes
 
-See this issue for more information: https://github.com/kubernetes/helm/issues/1455
+See this issue for more information: https://github.com/helm/helm/issues/1455
 
 **Q: On GKE (Google Container Engine) I get "No SSH tunnels currently open"**
 
diff --git a/docs/provenance.md b/docs/provenance.md
index 7a3f24fe7..be1d64b7a 100644
--- a/docs/provenance.md
+++ b/docs/provenance.md
@@ -262,9 +262,9 @@ in using the provenance system:
   - Keybase also has fabulous documentation available
   - While we haven't tested it, Keybase's "secure website" feature could
     be used to serve Helm charts.
-- The [official Kubernetes Charts project](https://github.com/kubernetes/charts)
+- The [official Kubernetes Charts project](https://github.com/helm/charts)
   is trying to solve this problem for the official chart repository.
-  - There is a long issue there [detailing the current thoughts](https://github.com/kubernetes/charts/issues/23).
+  - There is a long issue there [detailing the current thoughts](https://github.com/helm/charts/issues/23).
   - The basic idea is that an official "chart reviewer" signs charts with
     her or his key, and the resulting provenance file is then uploaded
     to the chart repository.
diff --git a/docs/quickstart.md b/docs/quickstart.md
index f6cc5f797..61f9f5f73 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -32,7 +32,7 @@ to [configure a service account and rules](rbac.md) before proceeding.
 ## Install Helm
 
 Download a binary release of the Helm client. You can use tools like
-`homebrew`, or look at [the official releases page](https://github.com/kubernetes/helm/releases).
+`homebrew`, or look at [the official releases page](https://github.com/helm/helm/releases).
 
 For more details, or for other options, see [the installation
 guide](install.md).
diff --git a/docs/related.md b/docs/related.md
index 83eb918c2..883c1b82d 100644
--- a/docs/related.md
+++ b/docs/related.md
@@ -2,8 +2,8 @@
 
 The Helm community has produced many extra tools, plugins, and documentation about
 Helm. We love to hear about these projects. If you have anything you'd like to
-add to this list, please open an [issue](https://github.com/kubernetes/helm/issues)
-or [pull request](https://github.com/kubernetes/helm/pulls).
+add to this list, please open an [issue](https://github.com/helm/helm/issues)
+or [pull request](https://github.com/helm/helm/pulls).
 
 ## Article, Blogs, How-Tos, and Extra Documentation
 - [Using Helm to Deploy to Kubernetes](https://daemonza.github.io/2017/02/20/using-helm-to-deploy-to-kubernetes/)
diff --git a/docs/release_checklist.md b/docs/release_checklist.md
index 3d8cb15e3..ec043697f 100644
--- a/docs/release_checklist.md
+++ b/docs/release_checklist.md
@@ -12,7 +12,7 @@ Just kidding! :trollface:
 
 All releases will be of the form vX.Y.Z where X is the major version number, Y is the minor version number and Z is the patch release number. This project strictly follows [semantic versioning](http://semver.org/) so following this step is critical.
 
-It is important to note that this document assumes that the git remote in your repository that corresponds to "https://github.com/kubernetes/helm" is named "upstream". If yours is not (for example, if you've chosen to name it "origin" or something similar instead), be sure to adjust the listed snippets for your local environment accordingly. If you are not sure what your upstream remote is named, use a command like `git remote -v` to find out.
+It is important to note that this document assumes that the git remote in your repository that corresponds to "https://github.com/helm/helm" is named "upstream". If yours is not (for example, if you've chosen to name it "origin" or something similar instead), be sure to adjust the listed snippets for your local environment accordingly. If you are not sure what your upstream remote is named, use a command like `git remote -v` to find out.
 
 If you don't have an upstream remote, you can add one easily using something like:
 
@@ -224,7 +224,7 @@ The community keeps growing, and we'd love to see you there.
   - `#helm-users` for questions and just to hang out
   - `#helm-dev` for discussing PRs, code, and bugs
 - Hang out at the Public Developer Call: Thursday, 9:30 Pacific via [Zoom](https://zoom.us/j/4526666954)
-- Test, debug, and contribute charts: [GitHub/kubernetes/charts](https://github.com/kubernetes/charts)
+- Test, debug, and contribute charts: [GitHub/kubernetes/charts](https://github.com/helm/charts)
 
 ## Installation and Upgrading
 
diff --git a/docs/using_helm.md b/docs/using_helm.md
index b18466e98..98732adfe 100755
--- a/docs/using_helm.md
+++ b/docs/using_helm.md
@@ -490,7 +490,7 @@ Charts that are archived can be loaded into chart repositories. See the
 documentation for your chart repository server to learn how to upload.
 
 Note: The `stable` repository is managed on the [Kubernetes Charts
-GitHub repository](https://github.com/kubernetes/charts). That project
+GitHub repository](https://github.com/helm/charts). That project
 accepts chart source code, and (after audit) packages those for you.
 
 ## Conclusion
diff --git a/pkg/chartutil/files_test.go b/pkg/chartutil/files_test.go
index 57fbe88ea..9d1c4f7bb 100644
--- a/pkg/chartutil/files_test.go
+++ b/pkg/chartutil/files_test.go
@@ -122,7 +122,7 @@ func TestToTOML(t *testing.T) {
 		t.Errorf("Expected %q, got %q", expect, got)
 	}
 
-	// Regression for https://github.com/kubernetes/helm/issues/2271
+	// Regression for https://github.com/helm/helm/issues/2271
 	dict := map[string]map[string]string{
 		"mast": {
 			"sail": "white",
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 5c657fca5..56b4ce7d4 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -230,7 +230,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error {
 		fmt.Fprintf(m.Out, "Downloading %s from repo %s\n", dep.Name, dep.Repository)
 
 		// Any failure to resolve/download a chart should fail:
-		// https://github.com/kubernetes/helm/issues/1439
+		// https://github.com/helm/helm/issues/1439
 		churl, username, password, err := findChartURL(dep.Name, dep.Version, dep.Repository, repos)
 		if err != nil {
 			saveError = errors.Wrapf(err, "could not find %s", churl)
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
index 28d272ae2..8af354615 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
@@ -7,7 +7,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.1.0
       description: Deploy a basic Alpine Linux pod
       keywords: []
@@ -20,7 +20,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.2.0
       description: Deploy a basic Alpine Linux pod
       keywords: []
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml
index 1956e9f83..f51257233 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml
@@ -7,7 +7,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 1.2.3
       description: Deploy a basic Alpine Linux pod
       keywords: []
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml
index 47bb1b77c..b90c4e232 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml
@@ -8,7 +8,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - http://username:password@example.com/foo-1.2.3.tgz
       version: 1.2.3
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml
index 872478c3f..37a74c9c1 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml
@@ -8,7 +8,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - https://example.com/foo-1.2.3.tgz
       version: 1.2.3
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml
index 14cdffece..75fcfdc69 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml
@@ -7,7 +7,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 1.2.3
       description: Deploy a basic Alpine Linux pod
       keywords: []
@@ -21,7 +21,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.2.0
       description: Deploy a basic Alpine Linux pod
       keywords: []
@@ -36,7 +36,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - http://example.com/foo-1.2.3.tgz
       version: 1.2.3
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml
index 1956e9f83..f51257233 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml
@@ -7,7 +7,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 1.2.3
       description: Deploy a basic Alpine Linux pod
       keywords: []
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml
index 210f92e45..987e2861a 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml
@@ -8,7 +8,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - charts/foo-1.2.3.tgz
       version: 1.2.3
@@ -21,7 +21,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - bar-1.2.3.tgz
       version: 1.2.3
diff --git a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml
index 210f92e45..987e2861a 100644
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml
@@ -8,7 +8,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - charts/foo-1.2.3.tgz
       version: 1.2.3
@@ -21,7 +21,7 @@ entries:
       keywords: []
       maintainers: []
       sources:
-        - https://github.com/kubernetes/charts
+        - https://github.com/helm/charts
       urls:
         - bar-1.2.3.tgz
       version: 1.2.3
diff --git a/pkg/downloader/testdata/signtest/alpine/Chart.yaml b/pkg/downloader/testdata/signtest/alpine/Chart.yaml
index 6fbb27f18..fea865aa5 100644
--- a/pkg/downloader/testdata/signtest/alpine/Chart.yaml
+++ b/pkg/downloader/testdata/signtest/alpine/Chart.yaml
@@ -2,5 +2,5 @@ description: Deploy a basic Alpine Linux pod
 home: https://k8s.io/helm
 name: alpine
 sources:
-- https://github.com/kubernetes/helm
+- https://github.com/helm/helm
 version: 0.1.0
diff --git a/pkg/getter/testdata/repository/cache/stable-index.yaml b/pkg/getter/testdata/repository/cache/stable-index.yaml
index bf187e3df..d4f883a25 100644
--- a/pkg/getter/testdata/repository/cache/stable-index.yaml
+++ b/pkg/getter/testdata/repository/cache/stable-index.yaml
@@ -214,7 +214,7 @@ entries:
     name: concourse
     sources:
     - https://github.com/concourse/bin
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     urls:
     - https://kubernetes-charts.storage.googleapis.com/concourse-0.1.3.tgz
     version: 0.1.3
@@ -234,7 +234,7 @@ entries:
     name: concourse
     sources:
     - https://github.com/concourse/bin
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     urls:
     - https://kubernetes-charts.storage.googleapis.com/concourse-0.1.2.tgz
     version: 0.1.2
@@ -254,7 +254,7 @@ entries:
     name: concourse
     sources:
     - https://github.com/concourse/bin
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     urls:
     - https://kubernetes-charts.storage.googleapis.com/concourse-0.1.1.tgz
     version: 0.1.1
@@ -273,7 +273,7 @@ entries:
     name: concourse
     sources:
     - https://github.com/concourse/bin
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     urls:
     - https://kubernetes-charts.storage.googleapis.com/concourse-0.1.0.tgz
     version: 0.1.0
@@ -3985,7 +3985,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.6.tgz
@@ -4006,7 +4006,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.5.tgz
@@ -4025,7 +4025,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.4.tgz
@@ -4044,7 +4044,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.3.tgz
@@ -4063,7 +4063,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.2.tgz
@@ -4082,7 +4082,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.1.tgz
@@ -4101,7 +4101,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.2.0.tgz
@@ -4120,7 +4120,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.1.2.tgz
@@ -4139,7 +4139,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.1.1.tgz
@@ -4158,7 +4158,7 @@ entries:
       name: Vic Iglesias
     name: mysql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/mysql-0.1.0.tgz
@@ -5034,7 +5034,7 @@ entries:
       name: Patrick Galbraith
     name: percona
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/percona
     urls:
     - https://kubernetes-charts.storage.googleapis.com/percona-0.1.0.tgz
@@ -5404,7 +5404,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.6.0.tgz
@@ -5426,7 +5426,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.5.1.tgz
@@ -5448,7 +5448,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.5.0.tgz
@@ -5470,7 +5470,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.4.0.tgz
@@ -5492,7 +5492,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.3.4.tgz
@@ -5512,7 +5512,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.3.3.tgz
@@ -5532,7 +5532,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.3.2.tgz
@@ -5552,7 +5552,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.3.1.tgz
@@ -5572,7 +5572,7 @@ entries:
     - name: databus23
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.3.0.tgz
@@ -5591,7 +5591,7 @@ entries:
     - name: swordbeta
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.2.2.tgz
@@ -5610,7 +5610,7 @@ entries:
     - name: swordbeta
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.2.1.tgz
@@ -5629,7 +5629,7 @@ entries:
     - name: swordbeta
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.2.0.tgz
@@ -5648,7 +5648,7 @@ entries:
     - name: swordbeta
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.1.1.tgz
@@ -5667,7 +5667,7 @@ entries:
     - name: swordbeta
     name: postgresql
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/docker-library/postgres
     urls:
     - https://kubernetes-charts.storage.googleapis.com/postgresql-0.1.0.tgz
@@ -6720,7 +6720,7 @@ entries:
     sources:
     - https://bitbucket.org/sapho/ops-docker-tomcat/src
     - https://hub.docker.com/r/sapho/ops-docker-tomcat
-    - https://github.com/kubernetes/charts/tree/master/stable/mysql
+    - https://github.com/helm/charts/tree/master/stable/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/sapho-0.1.5.tgz
     version: 0.1.5
@@ -6738,7 +6738,7 @@ entries:
     sources:
     - https://bitbucket.org/sapho/ops-docker-tomcat/src
     - https://hub.docker.com/r/sapho/ops-docker-tomcat
-    - https://github.com/kubernetes/charts/tree/master/stable/mysql
+    - https://github.com/helm/charts/tree/master/stable/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/sapho-0.1.4.tgz
     version: 0.1.4
@@ -6756,7 +6756,7 @@ entries:
     sources:
     - https://bitbucket.org/sapho/ops-docker-tomcat/src
     - https://hub.docker.com/r/sapho/ops-docker-tomcat
-    - https://github.com/kubernetes/charts/tree/master/stable/mysql
+    - https://github.com/helm/charts/tree/master/stable/mysql
     urls:
     - https://kubernetes-charts.storage.googleapis.com/sapho-0.1.3.tgz
     version: 0.1.3
@@ -6794,7 +6794,7 @@ entries:
       name: Shane Starcher
     name: sensu
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-sensu
     - https://github.com/sensu/sensu
     urls:
@@ -6815,7 +6815,7 @@ entries:
       name: Shane Starcher
     name: sensu
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-sensu
     - https://github.com/sensu/sensu
     urls:
@@ -6836,7 +6836,7 @@ entries:
       name: Shane Starcher
     name: sensu
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-sensu
     - https://github.com/sensu/sensu
     urls:
@@ -7506,7 +7506,7 @@ entries:
       name: Shane Starcher
     name: uchiwa
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-uchiwa
     - https://github.com/sensu/uchiwa
     urls:
@@ -7528,7 +7528,7 @@ entries:
       name: Shane Starcher
     name: uchiwa
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-uchiwa
     - https://github.com/sensu/uchiwa
     urls:
@@ -7550,7 +7550,7 @@ entries:
       name: Shane Starcher
     name: uchiwa
     sources:
-    - https://github.com/kubernetes/charts
+    - https://github.com/helm/charts
     - https://github.com/sstarcher/docker-uchiwa
     - https://github.com/sensu/uchiwa
     urls:
diff --git a/pkg/ignore/rules_test.go b/pkg/ignore/rules_test.go
index a2f709097..9581cf09f 100644
--- a/pkg/ignore/rules_test.go
+++ b/pkg/ignore/rules_test.go
@@ -99,7 +99,7 @@ func TestIgnore(t *testing.T) {
 		{`cargo/*.txt`, "mast/a.txt", false},
 		{`ru[c-e]?er.txt`, "rudder.txt", true},
 		{`templates/.?*`, "templates/.dotfile", true},
-		// "." should never get ignored. https://github.com/kubernetes/helm/issues/1776
+		// "." should never get ignored. https://github.com/helm/helm/issues/1776
 		{`.*`, ".", false},
 		{`.*`, "./", false},
 		{`.*`, ".joonix", true},
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 7d0da4782..6ee578aff 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -99,11 +99,11 @@ func Templates(linter *support.Linter, values []byte, namespace string, strict b
 			continue
 		}
 
-		// NOTE: disabled for now, Refs https://github.com/kubernetes/helm/issues/1463
+		// NOTE: disabled for now, Refs https://github.com/helm/helm/issues/1463
 		// Check that all the templates have a matching value
 		//linter.RunLinterRule(support.WarningSev, path, validateNoMissingValues(templatesPath, valuesToRender, preExecutedTemplate))
 
-		// NOTE: disabled for now, Refs https://github.com/kubernetes/helm/issues/1037
+		// NOTE: disabled for now, Refs https://github.com/helm/helm/issues/1037
 		// linter.RunLinterRule(support.WarningSev, path, validateQuotes(string(preExecutedTemplate)))
 
 		renderedContent := renderedContentMap[filepath.Join(chart.Name(), fileName)]
diff --git a/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml b/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
index e2d438701..bfade3dbc 100644
--- a/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
+++ b/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
@@ -7,7 +7,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.2.0
       description: Deploy a basic Alpine Linux pod
       keywords: []
@@ -20,7 +20,7 @@ entries:
       checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
       home: https://k8s.io/helm
       sources:
-      - https://github.com/kubernetes/helm
+      - https://github.com/helm/helm
       version: 0.1.0
       description: Deploy a basic Alpine Linux pod
       keywords: []
diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go
index 5652e5789..65e1c4964 100644
--- a/pkg/tiller/release_server.go
+++ b/pkg/tiller/release_server.go
@@ -46,7 +46,7 @@ import (
 //
 // As of Kubernetes 1.4, the max limit on a name is 63 chars. We reserve 10 for
 // charts to add data. Effectively, that gives us 53 chars.
-// See https://github.com/kubernetes/helm/issues/1528
+// See https://github.com/helm/helm/issues/1528
 const releaseNameMaxLen = 53
 
 // NOTESFILE_SUFFIX that we want to treat special. It goes through the templating engine
diff --git a/scripts/get b/scripts/get
index 943ca4158..4981d81d3 100755
--- a/scripts/get
+++ b/scripts/get
@@ -63,7 +63,7 @@ verifySupported() {
   local supported="darwin-386\ndarwin-amd64\nlinux-386\nlinux-amd64\nlinux-arm\nlinux-arm64\nlinux-ppc64le\nwindows-386\nwindows-amd64"
   if ! echo "${supported}" | grep -q "${OS}-${ARCH}"; then
     echo "No prebuilt binary for ${OS}-${ARCH}."
-    echo "To build from source, go to https://github.com/kubernetes/helm"
+    echo "To build from source, go to https://github.com/helm/helm"
     exit 1
   fi
 
@@ -76,7 +76,7 @@ verifySupported() {
 # checkDesiredVersion checks if the desired version is available.
 checkDesiredVersion() {
   # Use the GitHub releases webpage for the project to find the desired version for this project.
-  local release_url="https://github.com/kubernetes/helm/releases/${DESIRED_VERSION:-latest}"
+  local release_url="https://github.com/helm/helm/releases/${DESIRED_VERSION:-latest}"
   if type "curl" > /dev/null; then
     TAG=$(curl -SsL $release_url | awk '/\/tag\//' | grep -v no-underline | cut -d '"' -f 2 | awk '{n=split($NF,a,"/");print a[n]}' | awk 'a !~ $0{print}; {a=$0}')
   elif type "wget" > /dev/null; then
@@ -155,7 +155,7 @@ fail_trap() {
     else
       echo "Failed to install $PROJECT_NAME"
     fi
-    echo -e "\tFor support, go to https://github.com/kubernetes/helm."
+    echo -e "\tFor support, go to https://github.com/helm/helm."
   fi
   cleanup
   exit $result
@@ -182,7 +182,7 @@ help () {
   echo -e "\te.g. --version v2.4.0  or -v latest"
 }
 
-# cleanup temporary files to avoid https://github.com/kubernetes/helm/issues/2977
+# cleanup temporary files to avoid https://github.com/helm/helm/issues/2977
 cleanup() {
   if [[ -d "${HELM_TMP_ROOT:-}" ]]; then
     rm -rf "$HELM_TMP_ROOT"