diff --git a/billiard-3.6.3.0.tar.gz b/billiard-3.6.3.0.tar.gz
deleted file mode 100644
index b12a844..0000000
--- a/billiard-3.6.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d91725ce6425f33a97dfa72fb6bfef0e47d4652acd98a032bd1a7fbf06d5fa6a
-size 155090
diff --git a/billiard-3.6.4.0.tar.gz b/billiard-3.6.4.0.tar.gz
new file mode 100644
index 0000000..72df92c
--- /dev/null
+++ b/billiard-3.6.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:299de5a8da28a783d51b197d496bef4f1595dd023a93a4f59dde1886ae905547
+size 155303
diff --git a/billiard-pr310-py39-fork_exec.patch b/billiard-pr310-py39-fork_exec.patch
deleted file mode 100644
index d6611eb..0000000
--- a/billiard-pr310-py39-fork_exec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a508ebafadcfe2e25554b029593f3e66d01ede6c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Mon, 16 Mar 2020 21:50:36 +0100
-Subject: [PATCH] Issue #309: Add Python 3.9 support to spawnv_passfds()
-
-Python 3.9 added (umask, user, group, extra_groups) parameters to
-_posixsubprocess.fork_exec().
----
- billiard/compat.py | 8 ++++++--
- ~~tox.ini            | 2 +-~~
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/billiard/compat.py b/billiard/compat.py
-index b172d9a..b5ce7c7 100644
---- a/billiard/compat.py
-+++ b/billiard/compat.py
-@@ -220,10 +220,14 @@ def spawnv_passfds(path, args, passfds):
-         passfds = sorted(passfds)
-         errpipe_read, errpipe_write = os.pipe()
-         try:
--            return _posixsubprocess.fork_exec(
-+            args = [
-                 args, [fsencode(path)], True, tuple(passfds), None, None,
-                 -1, -1, -1, -1, -1, -1, errpipe_read, errpipe_write,
--                False, False, None)
-+                False, False]
-+            if sys.version_info >= (3, 9):
-+                args.extend((None, None, None, -1))  # group, extra_groups, user, umask
-+            args.append(None)  # preexec_fn
-+            return _posixsubprocess.fork_exec(*args)
-         finally:
-             os.close(errpipe_read)
-             os.close(errpipe_write)
diff --git a/billiard-sphinx4.patch b/billiard-sphinx4.patch
new file mode 100644
index 0000000..2a9b5b0
--- /dev/null
+++ b/billiard-sphinx4.patch
@@ -0,0 +1,15 @@
+Index: billiard-3.6.4.0/Doc/conf.py
+===================================================================
+--- billiard-3.6.4.0.orig/Doc/conf.py
++++ billiard-3.6.4.0/Doc/conf.py
+@@ -170,8 +170,8 @@ htmlhelp_basename = 'multiprocessingdoc'
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, document class [howto/manual]).
+ latex_documents = [
+-  ('index', 'multiprocessing.tex', ur'multiprocessing Documentation',
+-   ur'Python Software Foundation', 'manual'),
++  ('index', 'multiprocessing.tex', 'multiprocessing Documentation',
++   'Python Software Foundation', 'manual'),
+ ]
+ 
+ # The name of an image file (relative to this directory) to place at the top of
diff --git a/python-billiard.changes b/python-billiard.changes
index bf0d723..e602556 100644
--- a/python-billiard.changes
+++ b/python-billiard.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun  4 20:49:11 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 3.6.4.0:
+  * Issue #309: Add Python 3.9 support to spawnv_passfds()
+  * fix #314 
+- drop billiard-pr310-py39-fork_exec.patch (upstream)
+- add billard-sphinx4.patch: compat with Sphinx 4.x
+
 -------------------------------------------------------------------
 Fri Mar 19 19:42:02 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-billiard.spec b/python-billiard.spec
index bc78806..d59fffe 100644
--- a/python-billiard.spec
+++ b/python-billiard.spec
@@ -19,15 +19,14 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           python-billiard
-Version:        3.6.3.0
+Version:        3.6.4.0
 Release:        0
 Summary:        Python multiprocessing fork
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/celery/billiard
 Source:         https://files.pythonhosted.org/packages/source/b/billiard/billiard-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM billiard-pr310-py39-fork_exec.patch -- gh#celery/billiard#310
-Patch0:         billiard-pr310-py39-fork_exec.patch
+Patch0:         billiard-sphinx4.patch
 BuildRequires:  %{python_module case >= 1.3.1}
 BuildRequires:  %{python_module psutil}
 BuildRequires:  %{python_module pytest}