diff --git a/setup.cfg b/setup.cfg
index 784e3de4..eaa14df0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,11 +10,12 @@ keywords = reliable recoverable execution
            tasks flows workflows jobs
            persistence states
            asynchronous parallel threads
+           dataflow openstack
 classifier =
     Development Status :: 4 - Beta
     Environment :: OpenStack
-    Intended Audience :: Information Technology
     Intended Audience :: Developers
+    Intended Audience :: Information Technology
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
@@ -23,6 +24,8 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
+    Topic :: Software Development :: Libraries
+    Topic :: System :: Distributed Computing
 
 [global]
 setup-hooks =