diff --git a/.gitignore b/.gitignore
index ea36422..017a91a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,9 @@
 
 /tomlkit-0.5.3.tar.gz
 /tomlkit-sources-0.5.3.tar.gz
-
 /toml-test-39bb76d.tar.gz
+
+/tomlkit-0.5.4.tar.gz
+/tomlkit-0.5.5.tar.gz
+/tomlkit-0.5.7.tar.gz
+/tomlkit-0.5.8.tar.gz
diff --git a/00-use-setuptools-not-distutils.patch b/00-use-setuptools-not-distutils.patch
index 0dc978c..3c57e87 100644
--- a/00-use-setuptools-not-distutils.patch
+++ b/00-use-setuptools-not-distutils.patch
@@ -1,11 +1,15 @@
 diff --git a/setup.py b/setup.py
-index b9e735f..46e203d 100644
+index ebea59f..2279729 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1,5 +1,5 @@
+@@ -1,8 +1,8 @@
  # -*- coding: utf-8 -*-
 -from distutils.core import setup
 +from setuptools import setup
  
  packages = \
- ['tomlkit']
+-['tests', 'tomlkit']
++['tomlkit']
+ 
+ package_data = \
+ {'': ['*'],
diff --git a/python-tomlkit.spec b/python-tomlkit.spec
index 8f7db3c..b9f63f0 100644
--- a/python-tomlkit.spec
+++ b/python-tomlkit.spec
@@ -1,7 +1,4 @@
 %global pypi_name tomlkit
-%global tests_name toml-test
-%global tests_commit 39bb76d631ba103a94b377aaf52c979456677fb1
-%global tests_shortcommit %(c=%{tests_commit}; echo ${c:0:7})
 
 %{?python_enable_dependency_generator}
 
@@ -20,19 +17,13 @@ Molten.}
 
 Name:           python-%{pypi_name}
 Summary:        Style preserving TOML library
-Version:        0.5.3
-Release:        3%{?dist}
+Version:        0.5.8
+Release:        1%{?dist}
 License:        MIT
 
 URL:            https://github.com/sdispater/tomlkit
 Source0:        %{pypi_source}
 
-# pypi source doesn't have tests
-Source1:        %{url}/archive/%{version}/%{pypi_name}-sources-%{version}.tar.gz
-
-# data for unit tests from a separate git submodule
-Source2:        https://github.com/BurntSushi/%{tests_name}/archive/%{tests_commit}/%{tests_name}-%{tests_shortcommit}.tar.gz
-
 # patch setup.py to use setuptools::setup instead of distutils.core::setup
 Patch0:         00-use-setuptools-not-distutils.patch
 
@@ -55,16 +46,6 @@ Summary:        %{summary}
 %prep
 %autosetup -n %{pypi_name}-%{version} -p1
 
-# extract unit tests
-tar -xzf %{SOURCE1}
-cp -rp ./%{pypi_name}-%{version}/tests ./tests
-rm -rf ./%{pypi_name}-%{version}
-
-# extract test data
-tar -xzf %{SOURCE2}
-cp -rp ./%{tests_name}-%{tests_commit}/tests/ ./tests/toml-test/
-rm -rf ./%{tests_name}-%{tests_commit}
-
 
 %build
 %py3_build
@@ -82,11 +63,23 @@ rm -rf ./%{tests_name}-%{tests_commit}
 %license LICENSE
 %doc README.md
 
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python3_sitelib}/%{pypi_name}/
+%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 
 
 %changelog
+* Sat Oct 19 2019 Fabio Valentini <decathorpe@gmail.com> - 0.5.8-1
+- Update to version 0.5.8.
+
+* Fri Oct 04 2019 Fabio Valentini <decathorpe@gmail.com> - 0.5.7-1
+- Update to version 0.5.7.
+
+* Tue Jul 02 2019 Fabio Valentini <decathorpe@gmail.com> - 0.5.5-1
+- Update to version 0.5.5.
+
+* Sun Jun 30 2019 Fabio Valentini <decathorpe@gmail.com> - 0.5.4-1
+- Update to version 0.5.4.
+
 * Sat May 04 2019 Fabio Valentini <decathorpe@gmail.com> - 0.5.3-3
 - Use setup from setuptools, not distutils.core.
 
diff --git a/sources b/sources
index b0768da..00894d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (tomlkit-0.5.3.tar.gz) = 90939b380fb8c58a1825c45740d599f116adf5075b1efb327ceb72353b1d1b3d6d6b960ed7673d46af586fc3ed56a866a6a8eb8dfc2a78ea128b5b7f214b0b55
-SHA512 (tomlkit-sources-0.5.3.tar.gz) = 68f2c2df5bfe0986a8530bb72d35179be974105a11427a59d8d88ea2c1828284ed5518e9fdd90f82ab508e44e63176f7efb78acccc8f4baaa901805979f32c90
-SHA512 (toml-test-39bb76d.tar.gz) = 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
+SHA512 (tomlkit-0.5.8.tar.gz) = e224ad4522279ea94977eb60739d2a43ddbb2d60bac5d00eaa0a93e06cded14eb030c3438ec4be982437c75cc317d89c674fc9e00239e12f41a4ac57285be3e1