diff --git a/setup.py b/setup.py
index 6fc264b..7cefe10 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 from xstatic.pkg import moment_timezone as xs
 
 # The README.txt file should be written in reST so that PyPI can use
@@ -18,8 +18,7 @@ setup(
     license=xs.LICENSE,
     url=xs.HOMEPAGE,
     platforms=xs.PLATFORMS,
-    packages=find_packages(),
-    namespace_packages=['xstatic', 'xstatic.pkg'],
+    packages=find_namespace_packages(),
     include_package_data=True,
     zip_safe=False,
     install_requires=[],
diff --git a/xstatic/__init__.py b/xstatic/__init__.py
deleted file mode 100644
index de40ea7..0000000
--- a/xstatic/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/xstatic/pkg/__init__.py b/xstatic/pkg/__init__.py
deleted file mode 100644
index de40ea7..0000000
--- a/xstatic/pkg/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)