diff --git a/make_sphinx_optional.patch b/make_sphinx_optional.patch
index f7dc3f6..ca847be 100644
--- a/make_sphinx_optional.patch
+++ b/make_sphinx_optional.patch
@@ -20,7 +20,7 @@ index 2057839..04a5917 100644
 +from setuptools import find_packages, setup, Command
  
  name="pybeam"
- version="0.5"
+ version="0.6"
  test_suite="test"
  
 +class BuildSphinx(Command):
@@ -48,7 +48,7 @@ index 2057839..04a5917 100644
  	license='MIT',
  	packages=find_packages(exclude=(test_suite,)),
  	test_suite=test_suite,
--	install_requires=['construct>=2.9,<2.10', 'six', 'sphinx'],
+-	install_requires=['construct>=2.9,<2.11', 'six', 'sphinx'],
 -	command_options={
 -		'build_sphinx': {
 -			'project': ('setup.py', name),
@@ -57,7 +57,7 @@ index 2057839..04a5917 100644
 -			'source_dir': ('setup.py', 'doc')
 -		}
 -	},
-+	install_requires=['construct>=2.9,<2.10', 'six'],
++	install_requires=['construct>=2.9,<2.11', 'six'],
 +	cmdclass = {'build_sphinx': BuildSphinx},
  	zip_safe=False)
 -- 
diff --git a/pybeam-0.5.tar.gz b/pybeam-0.5.tar.gz
deleted file mode 100644
index ba90785..0000000
--- a/pybeam-0.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d622e94e5ca56d7345beccdb620b1f7a42600393ddc432a7772e4fbe654eff9
-size 11369
diff --git a/pybeam-0.6.tar.gz b/pybeam-0.6.tar.gz
new file mode 100644
index 0000000..42de075
--- /dev/null
+++ b/pybeam-0.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbbc2ca76308f5dd502938c029ad1bf6b968f177c262e4881c32d820640ead6a
+size 11363
diff --git a/python-pybeam.changes b/python-pybeam.changes
index f9b6510..a9c9882 100644
--- a/python-pybeam.changes
+++ b/python-pybeam.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Feb 14 09:50:49 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>
+
+- Version 0.6
+
+-------------------------------------------------------------------
+Wed Feb 12 16:47:55 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Remove doc conditional as it is never built due to always being
+  as a bcond_with
+- Use unittest directly to avoid setup.py test deprecation
+- Allow usage with construct 2.10
+
 -------------------------------------------------------------------
 Sun Dec 15 02:38:15 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/python-pybeam.spec b/python-pybeam.spec
index 54d2ba3..1a21e28 100644
--- a/python-pybeam.spec
+++ b/python-pybeam.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-pybeam
+# spec file for package python
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,39 +19,33 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
-%bcond_with    doc
-%bcond_without test
 %define psuffix -test
+%bcond_without test
 %endif
 %if "%{flavor}" == ""
-%bcond_with    doc
 %bcond_with    test
 %endif
 Name:           python-pybeam%{?psuffix}
-Version:        0.5
+Version:        0.6
 Release:        0
 Summary:        Python module to parse Erlang BEAM files
 License:        MIT
 Group:          Development/Languages/Python
-URL:            http://github.com/matwey/pybeam
+URL:            https://github.com/matwey/pybeam
 Source:         https://files.pythonhosted.org/packages/source/p/pybeam/pybeam-%{version}.tar.gz
 Patch0:         make_sphinx_optional.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-%if %{with doc}
-BuildRequires:  %{python_module Sphinx}
-BuildRequires:  %{python_module construct < 2.10}
-BuildRequires:  %{python_module construct >= 2.9}
-%endif
-%if %{with test}
-BuildRequires:  %{python_module pybeam == %{version}}
-BuildRequires:  %{python_module six}
-%endif
-Requires:       python-construct < 2.10
+Requires:       python-construct < 2.11
 Requires:       python-construct >= 2.9
 Requires:       python-six >= 1.4.0
 BuildArch:      noarch
+%if %{with test}
+BuildRequires:  %{python_module construct < 2.11}
+BuildRequires:  %{python_module construct >= 2.9}
+BuildRequires:  %{python_module six}
+%endif
 %python_subpackages
 
 %description
@@ -60,7 +54,7 @@ imports, exports, atoms, as well as compile info and attribute
 chunks in pretty python format.
 
 %package -n %{name}-doc
-Summary:        API Documentation for %name
+Summary:        API Documentation for %{name}
 Group:          Documentation/HTML
 
 %description -n %{name}-doc
@@ -76,9 +70,6 @@ chunks in pretty python format.
 %if %{without test}
 %python_build
 %endif
-%if %{with doc}
-%python_build build_sphinx
-%endif
 
 %install
 %if %{without test}
@@ -88,7 +79,7 @@ chunks in pretty python format.
 
 %check
 %if %{with test}
-%python_exec setup.py test
+%python_exec -m unittest discover
 %endif
 
 %if %{without test}
@@ -97,9 +88,4 @@ chunks in pretty python format.
 %{python_sitelib}/*
 %endif
 
-%if %{with doc}
-%files -n %{name}-doc
-%doc build/html
-%endif
-
 %changelog