diff --git a/setup.cfg b/setup.cfg
index 0b0899d89f4199e264506b3360f58f209974f820..c7c8d086098a74d736c7f39ef087999c963f22a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,12 +31,6 @@ classifier =
 install_requires =
     psutil
 python_requires = !=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
-package_dir=
-    =satella
-packages=find:
-
-[options.packages.find]
-where=satella
 
 [options.extras_require]
 HTTPJSONSource = requests
diff --git a/setup.py b/setup.py
index 905f3b03ad4ba9801a5b4dfd667665ab475ac131..94e41444d0095f3e01a0b10f6b1e6e9a8a96691a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 from satella import __version__
 
 
-setup(version=__version__)
+setup(packages=find_packages(include=['satella', 'satella.*']),
+      version=__version__)