diff --git a/docs/releasenotes.html b/docs/releasenotes.html
index 2d0b96ca3..b0e2c9e51 100644
--- a/docs/releasenotes.html
+++ b/docs/releasenotes.html
@@ -94,6 +94,8 @@
          <li class="body">JUnitTestCaseCheck erroneously mentions tearDown
          instead of setUp. (bug 955925, patch by Paul Guyot)</li>
 
+         <li class="body">JavadocTypeCheck does not find a tag on the
+         first comment line. (patch 959995, patch by Michael Tamm)</li>
       </ul>
 
       <p class="body">
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
index b5482a246..3cca43da1 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
@@ -76,9 +76,9 @@ import java.util.Vector;
  * &lt;/module&gt;
  * </pre>
  *
-
  * @author Oliver Burn
- * @version 1.0
+ * @author Michael Tamm
+ * @version 1.1
  */
 public class JavadocTypeCheck
     extends Check
@@ -219,9 +219,7 @@ public class JavadocTypeCheck
                                         tagName,
                                         content.trim()));
             }
-            if (i != 0) {
-                tagRE = Utils.getRE("^\\s*\\**\\s*@([:alpha:]+)\\s");
-            }
+            tagRE = Utils.getRE("^\\s*\\**\\s*@([:alpha:]+)\\s");
         }
         return tags;
     }
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputJavadoc.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputJavadoc.java
index b36e7cad5..42ce706ad 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputJavadoc.java
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputJavadoc.java
@@ -31,3 +31,12 @@ class InputJavadoc1
 class InputJavadoc2
 {
 }
+
+//Testing tag on first comment line
+/**
+* @author ABC
+* @version 1.1
+*/
+class InputJavadocType
+{
+}
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
index 7b7631146..e604b2175 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
@@ -195,6 +195,7 @@ public class JavadocTypeCheckTest extends BaseCheckTestCase
             "13: Type Javadoc tag @version must match pattern '\\$Revision.*\\$'.",
             "22: Type Javadoc comment is missing an @version tag.",
             "31: Type Javadoc tag @version must match pattern '\\$Revision.*\\$'.",
+            "40: Type Javadoc tag @version must match pattern '\\$Revision.*\\$'.",
         };
         verify(checkConfig, getPath("InputJavadoc.java"), expected);
     }