diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
index f63d089..c6a1767 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
@@ -286,12 +286,12 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
             $phpcsFile->addError($error, ($commentStart + 1), 'ShortStartSpace');
         }
 
-        if (preg_match('|[A-Z]|', $testShort[0]) === 0) {
+        if (preg_match('|[A-Z]|', $testShort[0]) === 0 && !$this->isInheritDoc()) {
             $error = 'Function comment short description must start with a capital letter';
             $phpcsFile->addError($error, ($commentStart + 1), 'ShortNotCapital');
         }
 
-        if ($lastChar !== '.') {
+        if ($lastChar !== '.' && !$this->isInheritDoc()) {
             $error = 'Function comment short description must end with a full stop';
             $phpcsFile->addError($error, ($commentStart + 1), 'ShortFullStop');
         }
@@ -337,6 +337,10 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
      */
     protected function processReturn($commentStart, $commentEnd)
     {
+        if ($this->isInheritDoc()) {
+          return;
+        }
+
         // Skip constructor and destructor.
         $className = '';
         if ($this->_classToken !== null) {
@@ -413,6 +417,10 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
      */
     protected function processParams($commentStart)
     {
+        if ($this->isInheritDoc()) {
+          return;
+        }
+
         $realParams = $this->currentFile->getMethodParameters($this->_functionToken);
 
         $params      = $this->commentParser->getParams();
@@ -581,6 +589,17 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
 
     }//end processSees()
 
+    /**
+     * Is the comment an inheritdoc?
+     *
+     * @return boolean True if the comment is an inheritdoc
+     */
+    protected function isInheritDoc ()
+    {
+      $content = $this->commentParser->getComment()->getContent();
+
+      return preg_match('#{@inheritdoc}#i', $content) === 1;
+    } // end isInheritDoc()
 
 }//end class