diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index a05c12726..041e31ffb 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -89,6 +89,11 @@
 			<property name="message" value="Usage of println"/>
 			<property name="ignoreComments" value="true"/>
 		</module>
+		<module name="RegexpSinglelineJava">
+			<property name="format" value="Boolean\.valueOf\("/>
+			<property name="message" value="Usage Boolean.valueOf(), consider using ParserUtils.parseXmlBoolean() instead (if you want to parse xs:boolean values)"/>
+			<property name="ignoreComments" value="true"/>
+		</module>
 		<module name="RegexpSinglelineJava">
 			<property name="format" value="^\t+"/>
 			<property name="message" value="Indent must not use tab characters. Use space instead."/>
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
index 981b437a5..35dde99b4 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
@@ -123,7 +123,9 @@ public class IntrospectionProvider{
         case "java.lang.String":
             return value;
         case "boolean":
+            // CHECKSTYLE:OFF
             return Boolean.valueOf(value);
+            // CHECKSTYLE:ON
         case "int":
             return Integer.valueOf(value);
         case "long":
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
index b5719be65..178e4ad85 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
@@ -92,7 +92,9 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
                                 value = Double.valueOf(valueText);
                             }
                             else if ("boolean".equals(type)) {
+                                // CHECKSTYLE:OFF
                                 value = Boolean.valueOf(valueText);
+                                // CHECKSTYLE:ON
                             }
                             else if ("string".equals(type)) {
                                 value = valueText;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
index c3b07c674..67daae007 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
@@ -104,7 +104,9 @@ public class WorkgroupProperties extends IQ {
             while (!done) {
                 int eventType = parser.next();
                 if ((eventType == XmlPullParser.START_TAG) && ("authRequired".equals(parser.getName()))) {
+                    // CHECKSTYLE:OFF
                     props.setAuthRequired(Boolean.valueOf(parser.nextText()).booleanValue());
+                    // CHECKSTYLE:ON
                 }
                 else if ((eventType == XmlPullParser.START_TAG) && ("email".equals(parser.getName()))) {
                     props.setEmail(parser.nextText());