diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php
index 45556764..f997b638 100644
--- a/Classes/PHPExcel/Worksheet.php
+++ b/Classes/PHPExcel/Worksheet.php
@@ -525,6 +525,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
 	{
+		$pChart->setWorksheet($this);
 		if (is_null($iChartIndex)) {
 			$this->_chartCollection[] = $pChart;
 		} else {
diff --git a/changelog.txt b/changelog.txt
index 1ac81085..6d0c51bc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -89,6 +89,7 @@ Fixed in develop branch:
 - Bugfix:   (MBaker)     Work items 15905 and 18183 - Allow "no impact" to formats on Conditional Formatting
 - Bugfix:   (wackonline) OOCalc Reader fix for NULL cells
 - Bugfix:   (seltzlab)   Fix to excel2007 Chart Writer when a $plotSeriesValues is empty
+- Bugfix:   (MBaker)     Various fixes to Chart handling
 - Bugfix:   (MBaker)     Work item 18370 - Error loading xlsx file with column breaks
 - Bugfix:   (MBaker)     OOCalc Reader now handles percentage and currency data types
 - Bugfix:   (MBaker)     OOCalc Reader modified to process number-rows-repeated