diff --git a/pymod2pkg/__init__.py b/pymod2pkg/__init__.py
index 1134e8d..775ce9b 100644
--- a/pymod2pkg/__init__.py
+++ b/pymod2pkg/__init__.py
@@ -134,14 +134,13 @@ SUSE_PKG_MAP = [
         pkgfun=openstack_prefix_tr),
     # OpenStack clients
     MultiRule(
-        mods=['python-ceilometerclient', 'python-cinderclient',
-              'python-designateclient', 'python-glanceclient',
-              'python-heatclient', 'python-ironicclient',
-              'python-keystoneclient', 'python-manilaclient',
-              'python-neutronclient', 'python-novaclient',
-              'python-saharaclient', 'python-swiftclient',
-              'python-troveclient', 'python-tuskarclient',
-              'python-zaqarclient'],
+        mods=['python-%sclient' % c for c in (
+                  'k8s', 'aodh', 'barbican', 'ceilometer', 'congress',
+                  'designate', 'heat', 'glance', 'ironic', 'keystone',
+                  'magnum', 'manila', 'mistral', 'murano', 'monasca',
+                  'neutron', 'nova', 'openstack', 'sahara', 'searchlight',
+                  'senlin', 'smaug', 'solum', 'swift', 'tacker', 'trove',
+                  'watcher', 'zaqar')],
         pkgfun=lambda x: x),
 ]
 
diff --git a/tests.py b/tests.py
index 476f0ba..fb7d259 100644
--- a/tests.py
+++ b/tests.py
@@ -39,6 +39,9 @@ class Pymod2PkgTests(unittest.TestCase):
     def test_translation_suse(self):
         self.assertEqual(pymod2pkg.module2package('nova', 'suse'),
                          'openstack-nova')
+        self.assertEqual(pymod2pkg.module2package('python-aodhclient',
+                                                  'suse'),
+                         'python-aodhclient')
         self.assertEqual(pymod2pkg.module2package('python-neutronclient',
                                                   'suse'),
                          'python-neutronclient')