diff --git a/PKGBUILD b/PKGBUILD
index 22e0fb2d..d09df8ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20200828
+pkgver=20210120
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/_service b/_service
index 446c78ff..7ba600f0 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
-  <service name="tar_scm" mode="disabled">
-    <param name="revision">20200828</param>
-    <param name="version">20200828</param>
+  <service name="tar_scm" mode="manual">
+    <param name="revision">20210120</param>
+    <param name="version">20210120</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>
@@ -13,9 +13,9 @@
     <param name="extract">dist/debian.rules</param>
     <param name="extract">dist/PKGBUILD</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="compression">gz</param>
     <param name="file">*.tar</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
 </services>
diff --git a/build.changes b/build.changes
index a45fc5ad..b33c32d9 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Jan 20 12:37:53 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+Features:
+- initial flatpak build support added
+- ccache support added
+- debtransform: Add Debian revision if not present
+- allow nodirindex filesystems via BuildFlags: vmfsoptions:nodirindex
+- Also do rich dep handling for PreReqs
+- kiwi image: configure ndb database if we install the rpm-ndb package
+- Implement alternative method to specify build-ignores
+
+Changes:
+- Ignore kiwi-image: deps when expanding image packages
+
+Fixes:
+- Improve autonumbering of source/patch
+- init_buildsystem: fix mode of /dev/full
+- drop option transparent_hugepages=never on s390x
+- Allow --vmdisk-filesystem-options as alias for --vm-disk-filesystem-options
+- Do not add a "kiwi-packagemanager:" dependency if no package manager is defined
+- debian:
+  - Do not leave trailing whitespace while generating .dsc
+  - Save modified version into .dsc file
+  - Fail `debtransform` test if `debdiff` can't find something
+  - return the unmapped arch if it is not found in the mapping hash
+  - build-recipe-debootstrap: add fallback for Debian SID distro
+
 -------------------------------------------------------------------
 Fri Aug 28 13:48:06 UTC 2020 - Adrian Schröter <adrian@suse.de>
 
diff --git a/build.dsc b/build.dsc
index d4f2b570..a37dfbd2 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20200828-1
+Version: 20210120
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 72802907..76c044a3 100644
--- a/build.spec
+++ b/build.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package build
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:        20200828
+Version:        20210120
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -60,6 +60,8 @@ 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.
 # Perl helper scripts use them.
@@ -250,7 +252,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf
 
 %files
 %defattr(-,root,root)
-%doc README
+%doc README.md
 /usr/bin/build
 /usr/bin/buildvc
 /usr/bin/unrpm
diff --git a/debian.changelog b/debian.changelog
index 70f73a14..76856a47 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20200828) unstable; urgency=low
+build (20210120) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/debian.compat b/debian.compat
index f599e28b..7ed6ff82 100644
--- a/debian.compat
+++ b/debian.compat
@@ -1 +1 @@
-10
+5
diff --git a/debian.control b/debian.control
index 9580e56b..4823cbe1 100644
--- a/debian.control
+++ b/debian.control
@@ -2,7 +2,7 @@ Source: build
 Section: devel
 Priority: optional
 Maintainer: Adrian Schroeter <adrian@suse.de>
-Build-Depends: debhelper (>= 10)
+Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
 Package: obs-build
diff --git a/obs-build-20200828.tar.gz b/obs-build-20200828.tar.gz
deleted file mode 100644
index c015d6da..00000000
--- a/obs-build-20200828.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c935768d95da9726433508d1330167eba3983cb3e15963b68a3b40f181cb3d3d
-size 350761
diff --git a/obs-build-20210120.tar.gz b/obs-build-20210120.tar.gz
new file mode 100644
index 00000000..24226c6a
--- /dev/null
+++ b/obs-build-20210120.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aad2410cc6bd040c91c6e5e2f738818e3e906fd7dbb730880fedd7924fdf5196
+size 382360