diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 57da27915f..f333bbf8d1 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -8,7 +8,8 @@ New rules:
  JUnit ruleset: UseAssertNullInsteadOfAssertTrue
  Strings ruleset: AppendCharacterWithChar, ConsecutiveLiteralAppends, UseIndexOfChar
  Design ruleset: AvoidConstantsInterface
- Optimizations ruleset: UseArraysAsList, AvoidArrayLoops, BooleanInversion
+ Optimizations ruleset: UseArraysAsList, AvoidArrayLoops 
+ Controversial ruleset: BooleanInversion
 Fixed bug 1277373 - InefficientStringBuffering now catches more cases.
 Fixed bug 1371757 - Misleading example in AvoidSynchronizedAtMethodLevel
 Fixed bug 1371980 - InefficientStringBuffering no longer flags StringBuffer methods other than append().
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/optimization/BooleanInversionTest.java b/pmd/regress/test/net/sourceforge/pmd/rules/optimization/BooleanInversionTest.java
index 0e5aa83bc5..82cf2c3ab3 100644
--- a/pmd/regress/test/net/sourceforge/pmd/rules/optimization/BooleanInversionTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/rules/optimization/BooleanInversionTest.java
@@ -11,7 +11,7 @@ public class BooleanInversionTest extends SimpleAggregatorTst {
     private Rule rule;
 
     public void setUp() throws RuleSetNotFoundException {
-        rule = findRule("optimizations", "BooleanInversion");
+        rule = findRule("controversial", "BooleanInversion");
     }
 
     public void testAll() {
diff --git a/pmd/rulesets/controversial.xml b/pmd/rulesets/controversial.xml
index abe82de707..e7f8a8d20d 100644
--- a/pmd/rulesets/controversial.xml
+++ b/pmd/rulesets/controversial.xml
@@ -355,6 +355,38 @@ Use explicit scoping instead of the default package private level
         <priority>3</priority>
     </rule>
 
+    <rule name="BooleanInversion"
+          message="Use bitwise inversion to invert boolean values"
+          class="net.sourceforge.pmd.rules.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/controversial.html#BooleanInversion">
+      <description>
+Use bitwise inversion to invert boolean values - it's the fastest way to do this.
+See http://www.javaspecialists.co.za/archive/newsletter.do?issue=042&amp;locale=en_US for specific details
+      </description>
+      <properties>
+          <property name="xpath">
+              <value>
+    <![CDATA[
+//AssignmentOperator[@Image="="]/../Expression/UnaryExpressionNotPlusMinus[@Image="!"]
+]]>
+             </value>
+          </property>
+      </properties>
+        <priority>3</priority>
+      <example>
+  <![CDATA[
+public class Foo {
+ public void main(bar) {
+  boolean b = true;
+  b = !b; // slow
+  b ^= true; // fast
+ }
+}
+]]>
+      </example>
+    </rule>
+
+
 </ruleset>
 
 
diff --git a/pmd/rulesets/optimizations.xml b/pmd/rulesets/optimizations.xml
index 0ab36d79d6..e2f90820d6 100644
--- a/pmd/rulesets/optimizations.xml
+++ b/pmd/rulesets/optimizations.xml
@@ -290,37 +290,6 @@ public class Test {
     </rule>
 
 
-    <rule name="BooleanInversion"
-          message="Use bitwise inversion to invert boolean values"
-          class="net.sourceforge.pmd.rules.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/optimizations.html#BooleanInversion">
-      <description>
-Use bitwise inversion to invert boolean values - it's the fastest way to do this.
-See http://www.javaspecialists.co.za/archive/newsletter.do?issue=042&amp;locale=en_US for specific details
-      </description>
-      <properties>
-          <property name="xpath">
-              <value>
-    <![CDATA[
-//AssignmentOperator[@Image="="]/../Expression/UnaryExpressionNotPlusMinus[@Image="!"]
-]]>
-             </value>
-          </property>
-      </properties>
-        <priority>3</priority>
-      <example>
-  <![CDATA[
-public class Foo {
- public void main(bar) {
-  boolean b = true;
-  b = !b; // slow
-  b ^= true; // fast
- }
-}
-]]>
-      </example>
-    </rule>
-
 
     <!--
     other optimization should be like avoiding