diff --git a/setup.cfg b/setup.cfg
index a74d8e8cb..e4dab987e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,7 @@ classifier =
 [files]
 packages =
     oslo
+    oslo.messaging
 namespace_packages =
     oslo
 
diff --git a/setup.py b/setup.py
index 59a00909e..1b05d12f5 100644
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,7 @@
 import setuptools
 
 setuptools.setup(
+    namespace_packages=['oslo'],
+    packages=['oslo', 'oslo.messaging'],
     setup_requires=['d2to1', 'pbr'],
     d2to1=True)