diff --git a/.rubocop.yml b/.rubocop.yml
index 2d1a607f..62c5c639 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -64,6 +64,16 @@ Style/GuardClause:
 Style/LineEndConcatenation:
   Enabled: false
 
+# Using `module_function` instead of `extend self` would make the instance
+# methods in these modules private. That would be a breaking change, so these
+# modules are excluded. See discussion in:
+# - https://github.com/airblade/paper_trail/pull/756
+# - https://github.com/bbatsov/ruby-style-guide/issues/556
+Style/ModuleFunction:
+  Exclude:
+    - 'lib/paper_trail/serializers/json.rb'
+    - 'lib/paper_trail/serializers/yaml.rb'
+
 Style/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b35a654a..19dca947 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -21,9 +21,3 @@ Metrics/PerceivedComplexity:
 # Offense count: 33
 Style/Documentation:
   Enabled: false
-
-# Offense count: 2
-Style/ModuleFunction:
-  Exclude:
-    - 'lib/paper_trail/serializers/json.rb'
-    - 'lib/paper_trail/serializers/yaml.rb'