diff --git a/setup.py b/setup.py
index 2282bfa93..a9e327cf4 100644
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,14 @@
 
 from Cython.Build import cythonize
 
+# Determine find_packages function to use depending on Python version
+find_packages_func = find_packages
+
+# If in Python 3.3 or later, load find_namespace_packages()
+if sys.version_info >= (3, 3):
+    from setuptools import find_namespace_packages
+    find_packages_func = find_namespace_packages
+
 
 kht_module = Extension("kht_module",
                     sources = ["Native/Hough/kht.cpp",
@@ -79,7 +87,7 @@
         install_requires=requirements,
         data_files=[('Catalogs', catalog_files), ('share', share_files)],
         ext_modules = [kht_module] + cythonize(cython_modules),
-        packages=find_packages(),
+        packages=find_packages_func(),
         include_package_data=True,
         include_dirs=[numpy.get_include()]
         )