diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..e6f922d
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,2 @@
+Style/LineLength:
+  Max: 80
diff --git a/build-emacs-for-macos b/build-emacs-for-macos
index 2b7c0e4..f9d2b4b 100755
--- a/build-emacs-for-macos
+++ b/build-emacs-for-macos
@@ -239,11 +239,21 @@ class Build
   def patches(opts = {})
     p = []
 
-    if opts[:xwidgets]
+    if %w[emacs-27 emacs-28].include?(ref)
+      if opts[:xwidgets]
+        p << {
+          url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
+               "patches/#{ref}/xwidgets_webkit_in_cocoa.patch"
+        }
+      end
+
       p << {
         url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
-             'patches/xwidgets_webkit_in_cocoa' \
-             "#{'-emacs-27' if ref == 'emacs-27'}.patch"
+             "patches/#{ref}/fix-window-role.patch"
+      }
+      p << {
+        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
+             "patches/#{ref}/system-appearance.patch"
       }
     end