diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 1d9747b..408025a 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -22,9 +22,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v6.5.2
+        uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v1.64
+          version: v2.0
 
       - name: Test
         run: go test -v ./...
diff --git a/.golangci.yml b/.golangci.yml
index 0b9b235..fb2b0f8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,52 +1,54 @@
+version: "2"
+
 run:
   tests: false
 
 linters:
-  disable-all: true
+  default: none
   enable:
     - errcheck
-    - gofmt
-    - goimports
     - govet
     - ineffassign
     - misspell
     - revive
-    - typecheck
     - unconvert
     - unused
-
-issues:
-  exclude-use-default: false
-  exclude-rules:
-    - path: cmd/patch2pr/
-      text: "should have( a package)? comment"
-    - path: internal/
-      text: "should have( a package)? comment"
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - fmt.Fprintln(os.Stdout)
-  goimports:
-    local-prefixes: github.com/bluekeyes/patch2pr
-  revive:
+  settings:
+    errcheck:
+      exclude-functions:
+        - fmt.Fprintln(os.Stdout)
+    revive:
+      rules:
+        - name: context-keys-type
+        - name: time-naming
+        - name: var-declaration
+        - name: unexported-return
+        - name: errorf
+        - name: blank-imports
+        - name: context-as-argument
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: increment-decrement
+        - name: var-naming
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: indent-error-flow
+  exclusions:
     rules:
-      # enable all rules from golint
-      - name: context-keys-type
-      - name: time-naming
-      - name: var-declaration
-      - name: unexported-return
-      - name: errorf
-      - name: blank-imports
-      - name: context-as-argument
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: increment-decrement
-      - name: var-naming
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: indent-error-flow
+      - path: cmd/patch2pr/
+        text: "should have( a package)? comment"
+      - path: internal/
+        text: "should have( a package)? comment"
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/bluekeyes/patch2pr