diff --git a/.goreleaser.yml b/.goreleaser.yml
index a2ad270f..0665db38 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,9 +1,11 @@
+version: 2
 env:
   - GO111MODULE=on
   - CGO_ENABLED=0
 before:
   hooks:
     - go mod tidy
+    - gzip duf.1
 builds:
   - binary: duf
     flags:
@@ -18,22 +20,26 @@ builds:
     goarch:
       - amd64
       - arm64
-      - 386
+      - "386"
       - arm
       - ppc64le
     goarm:
-      - 6
-      - 7
+      - "6"
+      - "7"
 
 archives:
   - format_overrides:
       - goos: windows
         format: zip
-    replacements:
-      windows: Windows
-      darwin: Darwin
-      386: i386
-      amd64: x86_64
+    name_template: >-
+      {{- .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
+    files:
+      - duf.1.gz
 
 nfpms:
   - builds:
@@ -51,7 +57,7 @@ nfpms:
 
 brews:
   - goarm: 6
-    tap:
+    repository:
       owner: muesli
       name: homebrew-tap
     commit_author:
@@ -59,6 +65,9 @@ brews:
       email: "muesli@gmail.com"
     homepage: "https://fribbledom.com/"
     description: "Disk Usage/Free Utility"
+    install: |
+      bin.install "duf"      
+      man1.install "duf.1.gz"
     # skip_upload: true
 
 signs: