diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5da5cd64e..3c78e4a41 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -3,6 +3,7 @@ project_name: govmomi
 
 builds:
   - id: govc
+    no_main_check: true
     goos: &goos-defs
       - linux
       - darwin
@@ -13,6 +14,7 @@ builds:
       - arm
       - arm64
       - mips64le
+      - s390x
     env:
       - CGO_ENABLED=0
       - PKGPATH=github.com/vmware/govmomi/govc/flags
@@ -21,6 +23,7 @@ builds:
     ldflags:
       - "-X {{.Env.PKGPATH}}.BuildVersion={{.Version}} -X {{.Env.PKGPATH}}.BuildCommit={{.ShortCommit}} -X {{.Env.PKGPATH}}.BuildDate={{.Date}}"
   - id: vcsim
+    no_main_check: true
     goos: *goos-defs
     goarch: *goarch-defs
     env:
@@ -30,6 +33,17 @@ builds:
     ldflags:
       - "-X main.buildVersion={{.Version}} -X main.buildCommit={{.ShortCommit}} -X main.buildDate={{.Date}}"
 
+nfpms:
+  - package_name: govmomi
+    builds:
+      - govc
+    homepage: https://github.com/vmware/govmomi
+    maintainer: Doug MacEachern <dougm@vmware.com>
+    description: |-
+      vSphere CLI
+    formats:
+      - rpm
+
 archives:
   - id: govcbuild
     builds:
@@ -90,7 +104,7 @@ brews:
     commit_author:
       name: Alfred the Narwhal
       email: cna-alfred@vmware.com
-    folder: Formula
+    directory: Formula
     homepage: "https://github.com/vmware/govmomi/blob/main/govc/README.md"
     description: "govc is a vSphere CLI built on top of govmomi."
     test: |
@@ -110,7 +124,7 @@ brews:
     commit_author:
       name: Alfred the Narwhal
       email: cna-alfred@vmware.com
-    folder: Formula
+    directory: Formula
     homepage: "https://github.com/vmware/govmomi/blob/main/vcsim/README.md"
     description: "vcsim is a vSphere API simulator built on top of govmomi."
     test: |