diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index b7a927e0819..88968ab93f1 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -38,10 +38,10 @@ def read(fname):
 setup(name="Marvin",
       version=VERSION,
       description="Marvin - Python client for Apache CloudStack",
-      author="Edison Su",
-      author_email="Edison.Su@citrix.com",
-      maintainer="Prasanna Santhanam",
-      maintainer_email="tsp@apache.org",
+      author="The Apache CloudStack Team",
+      author_email="dev@cloudstack.apache.org",
+      maintainer="The Apache CloudStack Team",
+      maintainer_email="dev@cloudstack.apache.org",
       long_description="Marvin is the Apache CloudStack python "
                        "client written around the unittest framework",
       platforms=("Any",),