diff --git a/MANIFEST.in b/MANIFEST.in
index 06f57ae..7c2743c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,10 @@
+include requirements.txt
 include README.md
+
 recursive-include waterz *.hpp
 recursive-include waterz *.pyx
 recursive-include waterz *.h
+recursive-include waterz *.h
+
 include waterz/frontend_agglomerate.cpp
+include waterz/evaluate.cpp
diff --git a/setup.py b/setup.py
index a63087e..98fa87b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,16 @@
 #from Cython.Build import cythonize
 import os
 
-version = '0.8.2'
+version = '0.8.6'
 
-with open('requirements.txt') as f:
+PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+with open(os.path.join(PACKAGE_DIR, "requirements.txt")) as f:
     requirements = f.read().splitlines()
     requirements = [l for l in requirements if not l.startswith('#')]
 
 
-with open("README.md", "r") as fh:
+with open(os.path.join(PACKAGE_DIR, "README.md"), "r") as fh:
     long_description = fh.read()
 
 class build_ext(_build_ext):
@@ -57,17 +59,6 @@ def finalize_options(self):
     install_requires=requirements,
     tests_require=['pytest'],
     packages=find_packages(),
-    package_data={
-	'': [
-	    'waterz/*.h',
-	    'waterz/*.hpp',
-	    'waterz/*.cpp',
-	    'waterz/*.cpp',
-	    'waterz/*.pyx',
-	    'waterz/backend/*.hpp',
-	]
-    },
-    include_package_data=True,
     zip_safe=False,
     ext_modules=extensions,
     classifiers=[