diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index b625e3b8..9056844a 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -725,7 +725,7 @@ class Font extends AbstractStyle
     }
 
     /**
-     * Set shading
+     * Set Paragraph
      *
      * @param mixed $value
      * @return self
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 7bcb8d92..9ad87510 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -170,6 +170,9 @@ class Styles extends AbstractPart
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
+        } else if (!is_null($paragraphStyle)) {
+        	// if type is 'paragraph' it should have a styleId
+            $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 
         // Style name
@@ -178,7 +181,9 @@ class Styles extends AbstractPart
         $xmlWriter->endElement();
 
         // Parent style
-        $xmlWriter->writeElementIf(!is_null($paragraphStyle), 'w:basedOn', 'w:val', 'Normal');
+        if (!is_null($paragraphStyle)) {
+             $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+        }
 
         // w:pPr
         if (!is_null($paragraphStyle)) {
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index f40387a1..df20ab3b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -18,7 +18,10 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles
@@ -74,4 +77,41 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertEquals('Normal', $element->getAttribute('w:val'));
     }
+
+    public function testFontStyleBasedOn()
+    {
+        $phpWord = new PhpWord();
+
+        $baseParagraphStyle = new Paragraph();
+        $baseParagraphStyle->setAlignment(Jc::CENTER);
+        $baseParagraphStyle = $phpWord->addParagraphStyle('BaseStyle', $baseParagraphStyle);
+         
+        $childFont = new Font();
+        $childFont->setParagraph($baseParagraphStyle);
+        $childFont->setSize(16);
+        $childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
+         
+        $otherFont = new Font();
+        $otherFont->setSize(20);
+        $otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        // Normal style generated?
+        $path = '/w:styles/w:style[@w:styleId="BaseStyle"]/w:name';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style with paragraph should have it's base style set to that paragraphs style name
+        $path = '/w:styles/w:style[w:name/@w:val="ChildFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style without paragraph should not have a base style set
+        $path = '/w:styles/w:style[w:name/@w:val="OtherFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertNull($element);
+    }
 }