diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
index 1d9eff0c48..69a750eca6 100644
--- a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
+++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
@@ -57,30 +57,37 @@ Less than 10 methods, with getter/setter...
      ]]></description>
         <expected-problems>0</expected-problems>
         <code>
-        	<![CDATA[
+            <![CDATA[
 public class Foo 
 {
-	 public void setMethod1(){}
-	 public void setMethod2(){}
-	 public void setMethod3(){}
-	 public void setMethod4(){}
-	 public void setMethod5(){}
-	 
-	 public void getMethod6(){}
-	 public void getMethod7(){}
-	 public void getMethod8(){}
-	 public void getMethod9(){}
-	 public void getMethod10(){}
-	 
-	 public void method11(){}
-	 public void method12(){}
-	 public void method13(){}
-	 public void method14(){}
-	 public void method15(){}
-	 public void method16(){}
+     public void setMethod1(){}
+     public void setMethod2(){}
+     public void setMethod3(){}
+     public void setMethod4(){}
+     public void setMethod5(){}
+     
+     public void getMethod6(){}
+     public void getMethod7(){}
+     public void getMethod8(){}
+     public void getMethod9(){}
+     public void getMethod10(){}
+     
+     public boolean isMethod11(){}
+     public boolean isMethod12(){}
+     public boolean isMethod13(){}
+     public boolean isMethod14(){}
+     public boolean isMethod15(){}
+     public boolean isMethod16(){}
+     
+     public void method17(){}
+     public void method18(){}
+     public void method19(){}
+     public void method20(){}
+     public void method21(){}
+     public void method22(){}
 }
-     	]]>
-		</code>
+]]>
+        </code>
     </test-code>
 
 </test-data>
diff --git a/pmd/rulesets/java/codesize.xml b/pmd/rulesets/java/codesize.xml
index 64f53c3b70..be58e8d64d 100644
--- a/pmd/rulesets/java/codesize.xml
+++ b/pmd/rulesets/java/codesize.xml
@@ -363,28 +363,34 @@ have more fine grained objects.
                     <!--  FIXME: Refine XPath to discard 'get' and 'set' methods with Block no more than 3 lines,
                                 something like this:
                                     not (
-                                    (
-                                    starts-with(@Image,'get')
-                                        or
-                                    starts-with(@Image,'set')
-                                    )
-                                    and ( (
-                                        (../Block/attribute::endLine)
-                                         -
-                                        (../Block/attribute::beginLine) ) <= 3 )
-                                    )
+                                            (
+                                                starts-with(@Image,'get')
+                                                or
+                                                starts-with(@Image,'set')
+                                                or
+                                                starts-with(@Image,'is')
+                                            )
+                                            and (
+                                                    (
+                                                        (../Block/attribute::endLine)
+                                                         -
+                                                        (../Block/attribute::beginLine)
+                                                    ) <= 3
+                                            )
+                                        )
                                 This will avoid discarding 'real' method...
                      -->
                     <![CDATA[
  //ClassOrInterfaceDeclaration/ClassOrInterfaceBody
      [
       count(descendant::MethodDeclarator[
-         not
-        (
-         starts-with(@Image,'get')
-           or
-         starts-with(@Image,'set')
-         )
+         not (
+                starts-with(@Image,'get')
+                or
+                starts-with(@Image,'set')
+                or
+                starts-with(@Image,'is')
+            )
       ]) > $maxmethods
    ]
                     ]]>
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 881a6865c0..321c47031c 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -320,6 +320,7 @@
             <li>Jared Bunting - Patch to add ASTAnnotationMethodDeclaration to Java AST</li>
             <li>Lucian Ciufudean - RedundantFieldInitializerRule</li>
             <li>Andreas Dangel - GodClass and LawOfDemeter rules, several bugfixes and cleanup</li>
+            <li>Riku Nykanen - patch improving TooManyMethods rule</li>
         </ul>
         </subsection>
         <subsection name="Organizations">