diff --git a/requirements.txt b/requirements.txt
index 683ca8868..ba29d1472 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
--e git+https://github.com/HearthSim/python-hearthstone.git#egg=hearthstone
-pytest
+-e .
+
diff --git a/setup.py b/setup.py
index 8d852b8be..27a4ee7b8 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 	"License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)"
 	"Programming Language :: Python",
 	"Programming Language :: Python :: 3",
-	"Programming Language :: Python :: 3.4",
+	"Programming Language :: Python :: 3.5",
 	"Topic :: Games/Entertainment :: Simulation",
 ]
 
@@ -21,14 +21,16 @@
 	name="fireplace",
 	version=fireplace.__version__,
 	packages=find_packages(exclude="tests"),
-	package_data={"": ["CardDefs.xml"]},
+	package_data={"fireplace": ["CardDefs.xml"]},
 	include_package_data=True,
+	install_requires=["hearthstone"],
+	dependency_links=["git+https://github.com/HearthSim/python-hearthstone.git#egg=hearthstone"],
 	tests_require=["pytest"],
 	author=fireplace.__author__,
 	author_email=fireplace.__email__,
 	description="Pure-python Hearthstone re-implementation and simulator",
 	classifiers=CLASSIFIERS,
-	download_url="https://github.com/jleclanche/python-bna/tarball/master",
+	download_url="https://github.com/jleclanche/fireplace/tarball/master",
 	long_description=README,
 	license="AGPLv3",
 	url="https://github.com/jleclanche/fireplace",