diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/security/StaticFieldMustBeFinal.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/security/StaticFieldMustBeFinal.java
deleted file mode 100644
index 3d1cca190a..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/security/StaticFieldMustBeFinal.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.rule.security;
-
-import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
-
-public class StaticFieldMustBeFinal extends AbstractJavaRule {
-    // no additional unit tests
-}
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index de6b56cedb..58bfe97398 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1727,6 +1727,38 @@ public class MaybeAUtility {
   public static void foo() {}
   public static void bar() {}
 }
+]]>
+        </example>
+    </rule>
+
+    <rule name="MutableStaticState"
+          language="java"
+          since="6.35.0"
+          message="Do not use non-final non-private static fields"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_design.html#mutablestaticstate">
+        <description>
+Non-private static fields must be made constants (or immutable references) by
+declaring them final.
+
+If you are using this rule, then you don't need this
+rule {% rule java/errorprone/AssignmentToNonFinalStatic %}.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="version" value="2.0"/>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//FieldDeclaration[@Static = true() and @Private = false() and @Final = false()]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public class Greeter { public static Foo foo = new Foo(); ... }       // avoid this
+public class Greeter { public static final Foo FOO = new Foo(); ... } // use this instead
 ]]>
         </example>
     </rule>
diff --git a/pmd-java/src/main/resources/category/java/security.xml b/pmd-java/src/main/resources/category/java/security.xml
index 3442b0210d..b6927e2b08 100644
--- a/pmd-java/src/main/resources/category/java/security.xml
+++ b/pmd-java/src/main/resources/category/java/security.xml
@@ -60,34 +60,6 @@ public class Foo {
         byte[] iv = "secret iv in here".getBytes();
     }
 }
-]]>
-        </example>
-    </rule>
-
-    <rule name="StaticFieldMustBeFinal"
-          language="java"
-          since="6.34.0"
-          message="Do not use non-final visible static fields"
-          class="net.sourceforge.pmd.lang.rule.XPathRule">
-        <description>
-            Visible static fields must be made constants (or immutable
-            references) by declaring them final.
-        </description>
-        <priority>3</priority>
-        <properties>
-            <property name="version" value="2.0"/>
-            <property name="xpath">
-                <value>
-                    <![CDATA[
-//FieldDeclaration[@Static = true() and @Private = false() and @Final = false()]
-]]>
-                </value>
-            </property>
-        </properties>
-        <example>
-            <![CDATA[
-public class Greeter { public static Foo foo = new Foo(); ... }       // avoid this
-public class Greeter { public static final Foo FOO = new Foo(); ... } // use this instead
 ]]>
         </example>
     </rule>
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticState.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticState.java
new file mode 100644
index 0000000000..0a80bb6c64
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticState.java
@@ -0,0 +1,11 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.design;
+
+import net.sourceforge.pmd.testframework.PmdRuleTst;
+
+public class MutableStaticState extends PmdRuleTst {
+    // no additional unit tests
+}
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/security/xml/StaticFieldMustBeFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MutableStaticState.xml
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/security/xml/StaticFieldMustBeFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MutableStaticState.xml