diff --git a/_service b/_service
index 14c9243..7a0c044 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">git://git.kernel.org/pub/scm/utils/b4/b4.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">@PARENT_TAG@</param>
-    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="revision">stable-0.6.y</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
diff --git a/_servicedata b/_servicedata
index c923a88..4e09786 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">git://git.kernel.org/pub/scm/utils/b4/b4.git</param>
-              <param name="changesrevision">27f1ca8ce3e64c434503f15b93d56f6d2fc87495</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">f93bbd3e50b1fb4507aa537f4004da545af9d890</param></service></servicedata>
\ No newline at end of file
diff --git a/b4-0.6.2+4.obscpio b/b4-0.6.2+4.obscpio
new file mode 100644
index 0000000..e8b8378
--- /dev/null
+++ b/b4-0.6.2+4.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8875e23e6b6e5a665fff1eb82bab6b4d9acb1060aeeea2b3679b15f7ffb84bd
+size 230923
diff --git a/b4-0.6.2.obscpio b/b4-0.6.2.obscpio
deleted file mode 100644
index 2bed5d1..0000000
--- a/b4-0.6.2.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f5b43cf5f4d1c192fdeb33735199cc3fc4866ac911164939a1dae38a1be71b8c
-size 229899
diff --git a/b4.changes b/b4.changes
index c338478..cda83b2 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jan 22 06:09:14 UTC 2021 - jslaby@suse.cz
+
+- Update to version 0.6.2+4:
+  * Save to/cc headers as-is for tracking
+  * Add -f to "b4 mbox" to filter dupes
+  * Check if -o is a maildir
+- Skip python 3.6 to fix build
+
 -------------------------------------------------------------------
 Mon Dec 21 10:26:12 UTC 2020 - jslaby@suse.cz
 
diff --git a/b4.obsinfo b/b4.obsinfo
index 3da51c3..4e683c1 100644
--- a/b4.obsinfo
+++ b/b4.obsinfo
@@ -1,5 +1,5 @@
 name: b4
-version: 0.6.2
-mtime: 1608330096
-commit: 27f1ca8ce3e64c434503f15b93d56f6d2fc87495
+version: 0.6.2+4
+mtime: 1609179217
+commit: f93bbd3e50b1fb4507aa537f4004da545af9d890
 
diff --git a/b4.spec b/b4.spec
index b7a6678..fa1a70b 100644
--- a/b4.spec
+++ b/b4.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package b4
 #
-# 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
@@ -16,10 +16,9 @@
 #
 
 
-%define skip_python2 1
-%define version_unconverted 0.6.2
+%define version_unconverted 0.6.2+4
 Name:           b4
-Version:        0.6.2
+Version:        0.6.2+4
 Release:        0
 Summary:        Helper scripts for kernel.org patches
 License:        GPL-2.0-or-later
@@ -28,8 +27,10 @@ URL:            https://git.kernel.org/pub/scm/utils/b4/b4.git
 Source0:        %{name}-%{version}.tar.xz
 Patch0:         0001-lift-requests-version-requirement.patch
 BuildArch:      noarch
-BuildRequires:  %{python_module requests}
-BuildRequires:  %{python_module setuptools}
+# for checks
+BuildRequires:  git-core
+BuildRequires:  python3-requests
+BuildRequires:  python3-setuptools
 Requires:       python3-dkimpy >= 1.0.5
 Requires:       python3-dnspython >= 2.0.0
 Requires:       python3-requests >= 2.24.0
@@ -50,22 +51,25 @@ precursor to Lore and Data in the Star Trek universe.
 sed -i.old '1{/#!.*/d}' b4/*.py
 
 %build
-%python_build
+%python3_build
 
 %install
-%python_install
+%python3_install
 mv %{buildroot}/%{_mandir}/man5 %{buildroot}/%{_mandir}/man.5
 
 %check
-%python_exec setup.py check
+python3 setup.py check
 export PYTHONPATH="./"
-%python_exec ./b4/command.py --version >check_version
-echo %version | grep "`cat check_version`"
+THEIRS=`python3 ./b4/command.py --version`
+OURS=`sed -n "s/__VERSION__ = '\(.*\)'/\1/p" b4/__init__.py`
+test "$THEIRS" = "$OURS"
+python3 ./b4/command.py --help |grep -q 'mbox,am,attest'
+python3 ./b4/command.py mbox abc |& grep -q 'Looking up https://lore.kernel.org/r/abc'
 
 %files
 %doc README.rst
 %license COPYING
-%{_bindir}/{%name}
+%{_bindir}/%{name}
 %dir %{_mandir}/man.5/
 %{_mandir}/man.5/b4.5.gz
 %{python_sitelib}/%{name}*