diff --git a/_service b/_service
index 47e698e..14c9243 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">stable-0.5.y</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="revision">@PARENT_TAG@</param>
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
diff --git a/_servicedata b/_servicedata
index b9e84a5..36ee729 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">6d6adf338ec454304d8cb3d30684fce6c595b0df</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">0369d53cf093aab6f69a0725ce21b0e05b4ed9b9</param></service></servicedata>
\ No newline at end of file
diff --git a/b4-0.5.4+0.obscpio b/b4-0.5.4+0.obscpio
deleted file mode 100644
index 1cab9a6..0000000
--- a/b4-0.5.4+0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f969af8e5d1db272caeeb3205b76c9fc1a2a5092459c6a6aa37b1eb17f50978
-size 212491
diff --git a/b4-0.6.1.obscpio b/b4-0.6.1.obscpio
new file mode 100644
index 0000000..8569a00
--- /dev/null
+++ b/b4-0.6.1.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e1290e4880df80cc3ca9c6f2f9bbf73d88bbcdcebe56d59517939047c14cc07
+size 228363
diff --git a/b4.changes b/b4.changes
index 8d77f13..3e90594 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Dec 08 06:52:43 UTC 2020 - jslaby@suse.cz
+
+- Update to version 0.6.1:
+  * Add dkimpy and dnspython to install_requires
+  * Don't crash if dkimpy is not installed
+  * Try all DKIM headers if failed on the first
+  * Silence some pycharm warnings
+  * Fix logic when adding trailers without DKIM sigs
+  * Limit slug length by 100 characters
+  * Fix ReST in README.rst
+  * Move the g= hash back into the XPH header
+  * Fix logic on git-patch-id hash generation
+  * Don't give up on attestation if there's no index
+  * Deal with dupe follow-up trailers sent to cover
+  * Fix crash when dnspython is not available
+  * Fix b4 ty auto-matching
+  * Fix headers generated by "b4 ty"
+  * man: Drop apostrophe from midmask value
+  * Properly clean up temporary threadfile
+  * and much more...
+
 -------------------------------------------------------------------
 Wed Dec 02 12:10:32 UTC 2020 - jslaby@suse.cz
 
diff --git a/b4.obsinfo b/b4.obsinfo
index b0b4602..de40443 100644
--- a/b4.obsinfo
+++ b/b4.obsinfo
@@ -1,5 +1,5 @@
 name: b4
-version: 0.5.4+0
-mtime: 1606838505
-commit: 6d6adf338ec454304d8cb3d30684fce6c595b0df
+version: 0.6.1
+mtime: 1607376387
+commit: 0369d53cf093aab6f69a0725ce21b0e05b4ed9b9
 
diff --git a/b4.spec b/b4.spec
index 4f2c6b3..75d69f7 100644
--- a/b4.spec
+++ b/b4.spec
@@ -17,9 +17,9 @@
 
 
 %define skip_python2 1
-%define version_unconverted 0.5.4+0
+%define version_unconverted 0.6.1
 Name:           b4
-Version:        0.5.4+0
+Version:        0.6.1
 Release:        0
 Summary:        Helper scripts for kernel.org patches
 License:        GPL-2.0-or-later
@@ -29,8 +29,9 @@ Source0:        %{name}-%{version}.tar.xz
 BuildArch:      noarch
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  tar
-Requires:       python3-requests
+Requires:       python3-dkimpy >= 1.0.5
+Requires:       python3-dnspython >= 2.0.0
+Requires:       python3-requests >= 2.24.0
 
 %description
 This is a helper utility to work with patches made available via a
@@ -51,9 +52,8 @@ sed -i.old '1{/#!.*/d}' b4/*.py
 %python_build
 
 %install
-install -d %{buildroot}/%{_mandir}/man.5
-install -m 0644 -t %{buildroot}/%{_mandir}/man.5 man/b4.5
 %python_install
+mv %{buildroot}/%{_mandir}/man5 %{buildroot}/%{_mandir}/man.5
 
 %check
 %python_exec setup.py check