diff --git a/README.rst b/README.rst
index c57e6fb6..9428d195 100644
--- a/README.rst
+++ b/README.rst
@@ -225,13 +225,9 @@ The results of all physics validation performed by the ``tests_physics.py`` test
 .. _RapidSim: https://github.com/gcowan/RapidSim/
 
 
-
 Contributing
 ============
 
 Contributions are always welcome, please have a look at the `Contributing guide`_.
 
 .. _Contributing guide: CONTRIBUTING.rst
-
-
-
diff --git a/setup.cfg b/setup.cfg
index 967900d5..44340f8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ maintainer_email = zfit@physik.uzh.ch
 description = TensorFlow implementation of the Raubold and Lynch method for n-body events
 ;install_requires = file: requirements.txt
 license = BSD 3-Clause
-long_description = file: README.rst, CHANGELOG.rst
+;long_description = file: README.rst
 keywords = TensorFlow, phasespace, HEP
 url = https://github.com/zfit/phasespace
 classifiers =
diff --git a/setup.py b/setup.py
index bde89e14..a3561cac 100644
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,12 @@
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+with open(os.path.join(here, 'README.rst'), encoding='utf-8') as readme_file:
+    readme = readme_file.read()
+
+with open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf-8') as history_file:
+    history = history_file.read()
+
 with open(os.path.join(here, 'requirements.txt'), encoding='utf-8') as requirements_file:
     requirements = requirements_file.read().splitlines()
 
@@ -24,6 +30,7 @@
 test_requirements = requirements_dev[requirements_dev_split + 1:]  # +1: skip empty line
 
 setup(
+    long_description=readme.replace(":math:", "") + '\n\n' + history,
     install_requires=requirements,
     tests_require=test_requirements,
     extras_require={