diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index f43fbe54c0..c94b248a3b 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -26,6 +26,9 @@ Layout/CaseIndentation:
 Layout/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
 
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
 Layout/IndentArray:
   EnforcedStyle: special_inside_parentheses
 
@@ -52,9 +55,6 @@ Lint/AmbiguousBlockAssociation:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
 # so many of these in formulae and can't be autocorrected
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
@@ -205,7 +205,10 @@ Style/TernaryParentheses:
   EnforcedStyle: require_parentheses_when_complex
 
 # makes diffs nicer
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/TrailingCommaInArguments:
@@ -215,6 +218,10 @@ Style/TrailingCommaInArguments:
 Naming/VariableNumber:
   Enabled: false
 
+# doesn't make sense for Homebrew/brew but does for taps
+Naming/UncommunicativeMethodParamName:
+  Enabled: true
+
 Style/WordArray:
   MinSize: 4
 
diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index e0089e0500..58b911ca9f 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -68,6 +68,10 @@ Naming/PredicateName:
     - 'compat/**/*'
   NameWhitelist: is_32_bit?, is_64_bit?
 
+# f meaning formulae is pretty standard
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
 Style/BlockDelimiters:
   Exclude:
     - '**/*_spec.rb'