diff --git a/_service b/_service
index 7565ce6..103f106 100644
--- a/_service
+++ b/_service
@@ -1,15 +1,14 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="obs_scm" mode="disabled">
     <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="versionformat">@PARENT_TAG@+git%cd.g%h</param>
+    <param name="revision">stable-0.5.y</param>
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">b4-*.tar</param>
-    <param name="compression">xz</param>
-  </service>
   <service name="set_version" mode="disabled" />
+
+  <service name="tar" mode="buildtime"/>
 </services>
diff --git a/_servicedata b/_servicedata
index 798c2ec..93a2ca9 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">5c4ec14b2c003031885d44a6249c0c58099672fc</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">57aa10be35dda4201ee1d208e7b00a55e9133617</param></service></servicedata>
\ No newline at end of file
diff --git a/b4.changes b/b4.changes
index dcdd9a8..82086cc 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Jul 28 11:07:40 UTC 2020 - jslaby@suse.com
+
+- Update to version 0.5.2:
+  * Prepare for 0.5.2 release
+  * Fix handling of single-paragraph commit message bodies
+  * Fix basement detection for empty commit message bodies
+  * Support mbox -m to be a maildir
+  * man: Update commit url mask to contain 12 chars of ID
+  * Fix attestation error messages
+  * Deal with [PATCHvX] subjects
+  * Fix crash when -c used with incomplete series
+  * man: Drop the apostrophe from the linkmask configuration
+  * Fix crash with unbalanced [] in subject
+  * Fix regression with oddball charsets
+  * Up the version to 0.5.2-dev
+  * Prepare for 0.5.1 release
+  * Fix mbox naming inconsistencies
+  * Output less confusing trailer mismatch messages
+  * Fix bug with threading when cover ref is missing
+  * Fix body part parsing when '---' is not used
+  * Use proper charset when reading back mailinfo
+  * Don't output git am suggestion for -o -
+  * Add --no-cover and -o - to output to stdout
+  * Use unicode escape sequences
+  * Up the version to 0.5.1-dev
+- switch to obs_scm
+- switch to 0.5 stable branch
+
 -------------------------------------------------------------------
 Tue Jun 16 06:23:16 UTC 2020 - jslaby@suse.com
 
diff --git a/b4.spec b/b4.spec
index 90d7bbb..1bee940 100644
--- a/b4.spec
+++ b/b4.spec
@@ -17,17 +17,18 @@
 
 
 %define skip_python2 1
-%define version_unconverted 0.5.0+git20200612.g5c4ec14b
+%define version_unconverted 0.5.2
 Name:           b4
-Version:        0.5.0+git20200612.g5c4ec14b
+Version:        0.5.2
 Release:        0
 Summary:        Helper scripts for kernel.org patches
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Other
 URL:            https://git.kernel.org/pub/scm/utils/b4/b4.git
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar
 BuildArch:      noarch
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  tar
 
 %description
 This is a helper utility to work with patches made available via a