diff --git a/cmd/helm/testdata/output/upgrade-install-with-subchart-notes.txt b/cmd/helm/testdata/output/upgrade-install-with-subchart-notes.txt
new file mode 100644
index 000000000..767b8c5d9
--- /dev/null
+++ b/cmd/helm/testdata/output/upgrade-install-with-subchart-notes.txt
@@ -0,0 +1,11 @@
+Release "wacky-bunny" has been upgraded. Happy Helming!
+NAME: wacky-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 2
+TEST SUITE: None
+NOTES:
+SUBCHART NOTES
+
+PARENT NOTES
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/Chart.yaml b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/Chart.yaml
new file mode 100644
index 000000000..6ea036678
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: Chart with subchart notes
+name: chart-with-subchart-notes
+version: 0.0.1
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/Chart.yaml b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/Chart.yaml
new file mode 100644
index 000000000..5ac27f2fd
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: Subchart with notes
+name: subchart-with-notes
+version: 0.0.1
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/templates/NOTES.txt b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/templates/NOTES.txt
new file mode 100644
index 000000000..1f61a294e
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/templates/NOTES.txt
@@ -0,0 +1 @@
+SUBCHART NOTES
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/values.yaml b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/requirements.yaml b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/requirements.yaml
new file mode 100644
index 000000000..6351bf042
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/requirements.yaml
@@ -0,0 +1,3 @@
+dependencies:
+  - name: subchart-with-notes
+    version: 0.0.1
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/templates/NOTES.txt b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/templates/NOTES.txt
new file mode 100644
index 000000000..9e166d370
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/templates/NOTES.txt
@@ -0,0 +1 @@
+PARENT NOTES
diff --git a/cmd/helm/testdata/testcharts/chart-with-subchart-notes/values.yaml b/cmd/helm/testdata/testcharts/chart-with-subchart-notes/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go
index 3cecbe6d3..4956c0247 100644
--- a/cmd/helm/upgrade_test.go
+++ b/cmd/helm/upgrade_test.go
@@ -196,6 +196,38 @@ func TestUpgradeWithStringValue(t *testing.T) {
 
 }
 
+func TestUpgradeInstallWithSubchartNotes(t *testing.T) {
+
+	releaseName := "wacky-bunny-v1"
+	relMock, ch, _ := prepareMockRelease(releaseName, t)
+
+	defer resetEnv()()
+
+	store := storageFixture()
+
+	store.Create(relMock(releaseName, 1, ch))
+
+	cmd := fmt.Sprintf("upgrade %s -i --render-subchart-notes '%s'", releaseName, "testdata/testcharts/chart-with-subchart-notes")
+	_, _, err := executeActionCommandC(store, cmd)
+	if err != nil {
+		t.Errorf("unexpected error, got '%v'", err)
+	}
+
+	upgradedRel, err := store.Get(releaseName, 2)
+	if err != nil {
+		t.Errorf("unexpected error, got '%v'", err)
+	}
+
+	if !strings.Contains(upgradedRel.Info.Notes, "PARENT NOTES") {
+		t.Errorf("The parent notes are not set correctly. NOTES: %s", upgradedRel.Info.Notes)
+	}
+
+	if !strings.Contains(upgradedRel.Info.Notes, "SUBCHART NOTES") {
+		t.Errorf("The subchart notes are not set correctly. NOTES: %s", upgradedRel.Info.Notes)
+	}
+
+}
+
 func TestUpgradeWithValuesFile(t *testing.T) {
 
 	releaseName := "funny-bunny-v4"