diff --git a/_service b/_service
index e52c306..8da44cd 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
buildah
@PARENT_TAG@
v(.*)
- v1.20.1
+ v1.21.0
enable
diff --git a/_servicedata b/_servicedata
index e922e0a..2fe48a1 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/containers/buildah.git
- 99f733350dcc0d1d411f656005f8a390f0e1f3bb
\ No newline at end of file
+ 5e3515c5b09fe706d32bd4443800a996138516b2
\ No newline at end of file
diff --git a/buildah-1.20.1.tar.xz b/buildah-1.20.1.tar.xz
deleted file mode 100644
index 7cdb8b1..0000000
--- a/buildah-1.20.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77e8423aba39756e9f00f859b4dd1202c69e040d4d5c6d108abe406e4d6c8d65
-size 6371348
diff --git a/buildah-1.21.0.tar.xz b/buildah-1.21.0.tar.xz
new file mode 100644
index 0000000..032e119
--- /dev/null
+++ b/buildah-1.21.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ed623326b9035db7aeb67ca4b5ce5d154bb677cf8018ec7be78da9565ccc347
+size 6494936
diff --git a/buildah.changes b/buildah.changes
index 17cf7fe..0c44a99 100644
--- a/buildah.changes
+++ b/buildah.changes
@@ -1,3 +1,89 @@
+-------------------------------------------------------------------
+Mon May 24 13:59:14 UTC 2021 - alexandre.vicenzi@suse.com
+
+- Update to version 1.21.0:
+ * Bump to v1.21.0 - [NO TESTS NEEDED]
+ * Don't blow up if cpp detects errors
+ * Vendor in containers/common v0.38.4
+ * Remove 'buildah run --security-opt' from completion
+ * update c/common
+ * Fix handling of --default-mounts-file
+ * update vendor of containers/storage v1.31.1
+ * Bump github.com/containers/storage from 1.30.3 to 1.31.0
+ * Send logrus messages back to caller when building
+ * github: Fix bad repo. ref in workflow config
+ * Check earlier for bad image tags name
+ * buildah bud: fix containers/podman/issues/10307
+ * Bump github.com/containers/storage from 1.30.1 to 1.30.3
+ * Cirrus: Support [CI:DOCS] test skipping
+ * Notification email for cirrus-cron build failures
+ * Bump github.com/opencontainers/runc from 1.0.0-rc93 to 1.0.0-rc94
+ * Fix race condition
+ * Fix copy race while walking paths
+ * Preserve ownership of lower directory when doing an overlay mount
+ * Bump github.com/onsi/gomega from 1.11.0 to 1.12.0
+ * Update nix pin with `make nixpkgs`
+ * codespell cleanup
+ * Multi-arch github-action workflow unification
+ * Bump github.com/containers/image/v5 from 5.11.1 to 5.12.0
+ * Bump github.com/onsi/ginkgo from 1.16.1 to 1.16.2
+ * imagebuildah: ignore signatures when tagging images
+ * update to latest libimage
+ * Bump github.com/containers/common from 0.37.0 to 0.37.1
+ * Bump github.com/containers/storage from 1.30.0 to 1.30.1
+ * Upgrade to GitHub-native Dependabot
+ * Document location of auth.json file if XDG_RUNTIME_DIR is not set
+ * run.bats: fix flake in run-user test
+ * Cirrus: Update F34beta -> F34
+ * pr-should-include-tests: try to make work in buildah
+ * runUsingRuntime: when relaying error from the runtime, mention that
+ * Run(): avoid Mkdir() into the rootfs
+ * imagebuildah: replace archive with chrootarchive
+ * imagebuildah.StageExecutor.volumeCacheSaveVFS(): set up bind mounts
+ * conformance: use :Z with transient mounts when SELinux is enabled
+ * bud.bats: fix a bats warning
+ * imagebuildah: create volume directories when using overlays
+ * imagebuildah: drop resolveSymlink()
+ * namespaces test - refactoring and cleanup
+ * Refactor 'idmapping' system test
+ * Cirrus: Update Ubuntu images to 21.04
+ * Tiny fixes in bud system tests
+ * Add compabitility wrappers for removed packages
+ * Fix expected message at pulling image
+ * Fix system tests of 'bud' subcommand
+ * [CI:DOCS] Update steps for CentOS runc users
+ * Add support for secret mounts
+ * Add buildah manifest rm command
+ * restore push/pull and util API
+ * [CI:DOCS] Remove older distro docs
+ * Rename rhel secrets to subscriptions
+ * vendor in openshift/imagebuilder
+ * Remove buildah bud --loglevel ...
+ * use new containers/common/libimage package
+ * Fix copier when using globs
+ * Test namespace flags of 'bud' subcommand
+ * Add system test of 'bud' subcommand
+ * Output names of multiple tags in buildah bud
+ * push to docker test: don't get fooled by podman
+ * copier: add Remove()
+ * build(deps): bump github.com/containers/image/v5 from 5.10.5 to 5.11.1
+ * Restore log timestamps
+ * Add system test of 'buildah help' with a tiny fix
+ * tests: copy.bats: fix infinite hang
+ * Do not force hard code to crun in rootless mode
+ * build(deps): bump github.com/openshift/imagebuilder from 1.2.0 to 1.2.1
+ * build(deps): bump github.com/containers/ocicrypt from 1.1.0 to 1.1.1
+ * build(deps): bump github.com/containers/common from 0.35.4 to 0.36.0
+ * Fix arg missing warning in bud
+ * Check without flag in 'from --cgroup-parent' test
+ * Minor fixes to Buildah as a library tutorial documentation
+ * Add system test of 'buildah version' for packaged buildah
+ * Add a few system tests of 'buildah from'
+ * Log the final error with %+v at logging level "trace"
+ * copier: add GetOptions.NoCrossDevice
+ * Update nix pin with `make nixpkgs`
+ * Bump to v1.20.2-dev
+
-------------------------------------------------------------------
Thu Apr 15 12:28:09 UTC 2021 - alexandre.vicenzi@suse.com
diff --git a/buildah.spec b/buildah.spec
index 942b521..ea1a679 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -22,7 +22,7 @@
%define with_libostree 1
%endif
Name: buildah
-Version: 1.20.1
+Version: 1.21.0
Release: 0
Summary: Tool for building OCI containers
License: Apache-2.0