diff --git a/PKGBUILD b/PKGBUILD
index d09df8ad..a79e95fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20210120
+pkgver=20210820
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/_service b/_service
index 7ba600f0..decbed48 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="manual">
-    <param name="revision">20210120</param>
-    <param name="version">20210120</param>
+    <param name="revision">20210820</param>
+    <param name="version">20210820</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>
diff --git a/build.changes b/build.changes
index b33c32d9..ef60ffb8 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Fri Aug 20 07:44:26 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+Features:
+- cross architecture build support (for rpm and kiwi)
+- modulemd meta data support
+- pbuild to build multiple source packages
+  (initial release, can not be considered stable yet)
+- supporting external asset stores for source files
+- support multiple post build checks placed in the directory:
+  /usr/lib/build/post-build-checks/
+- sccache support
+- New --shell-after-fail option
+- allow to disable squashfs in SimpleImage
+- supporting aarch64 kernel on armv?l distributions
+- kiwi: Add support for OBS-RemoteAsset and OBS-CopyToImage directives
+- container: FROM scratch build support
+
+Improvements:
+- supporting kvm builds as non-root user
+- Extend stage selection support for rpm builds
+- various distribution config updates
+- Support "BuildFlags: cumulaterpms"
+  (was done only via suse_version before)
+
+Fixes:
+- container builds
+  * support newer podman versions
+  * supporting multiple containers for multi-stage builds
+- Supporting URL's in Flatpak manifests
+- epoch handling in debian builds
+- catch more cases where a failed build is marked as host error
+- fixing wrong status reporting when a job got killed
+- hugetlbfs handling fixes
+- try mounting selinuxfs in VM
+- Also create the /sys dir when preinstalling (to satisfy dracut)
+- various XML parser fixes
+- and many minor ones
+
 -------------------------------------------------------------------
 Wed Jan 20 12:37:53 UTC 2021 - Adrian Schröter <adrian@suse.de>
 
diff --git a/build.dsc b/build.dsc
index a37dfbd2..c2e6536c 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20210120
+Version: 20210820
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 76c044a3..fc2ac161 100644
--- a/build.spec
+++ b/build.spec
@@ -28,7 +28,7 @@ Name:           %{__pkg_name}
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0-only OR GPL-3.0-only
 Group:          Development/Tools/Building
-Version:        20210120
+Version:        20210820
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -60,7 +60,6 @@ Conflicts:      bsdtar < 2.5.5
 BuildRequires:  perl(Date::Parse)
 BuildRequires:  perl(Test::Harness)
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(YAML)
 BuildRequires:  perl(YAML::LibYAML)
 %if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21
 # None of them are actually required for core features.
@@ -73,7 +72,6 @@ Recommends:     perl(Time::Zone)
 Recommends:     perl(URI)
 Recommends:     perl(XML::Parser)
 Recommends:     perl(Net::SSL)
-Recommends:     perl(YAML)
 Recommends:     perl(YAML::LibYAML)
 Recommends:     bsdtar
 Recommends:     qemu-linux-user
@@ -248,12 +246,16 @@ exit 0
 %endif
 # we need to patch the not packaged configs, due to the buildignore
 sed -i 's,build-mkbaselibs,,' ../configs/*.conf
+if [ ! -e /.build.packages/rpmlint-Factory.rpm ]; then
+  sed -i 's,rpmlint-Factory,,' ../configs/*.conf
+fi
 ./testbuild.sh /.build.binaries/
 
 %files
 %defattr(-,root,root)
 %doc README.md
 /usr/bin/build
+/usr/bin/pbuild
 /usr/bin/buildvc
 /usr/bin/unrpm
 /usr/lib/build
@@ -261,6 +263,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf
 %{_mandir}/man1/build.1*
 %{_mandir}/man1/unrpm.1*
 %{_mandir}/man1/buildvc.1*
+%{_mandir}/man1/pbuild.1*
 %if 0%{?suse_version}
 %exclude /usr/lib/build/initvm.*
 %endif
diff --git a/debian.changelog b/debian.changelog
index 76856a47..393e70b4 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20210120) unstable; urgency=low
+build (20210820) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20210120.tar.gz b/obs-build-20210120.tar.gz
deleted file mode 100644
index 24226c6a..00000000
--- a/obs-build-20210120.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aad2410cc6bd040c91c6e5e2f738818e3e906fd7dbb730880fedd7924fdf5196
-size 382360
diff --git a/obs-build-20210820.tar.gz b/obs-build-20210820.tar.gz
new file mode 100644
index 00000000..851d6305
--- /dev/null
+++ b/obs-build-20210820.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50509e6ad3f782c5eadf2c8e4e32557fc96da9239e7e02cd8b6e5c7353249be3
+size 484099