diff --git a/README.rst b/README.rst
index ad8d15f..0611a00 100644
--- a/README.rst
+++ b/README.rst
@@ -127,3 +127,8 @@ License
 -------
 
 This work is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-xqueue/blob/master/LICENSE.txt>`_.
+
+Troubleshooting
+---------------
+
+This Tutor plugin is maintained by Jhony Avella from `eduNEXT <https://www.edunext.co/>`__. Community support is available from the official `Open edX forum <https://discuss.openedx.org>`__. Do you need help with this plugin? See the `troubleshooting <https://docs.tutor.overhang.io/troubleshooting.html>`__ section from the Tutor documentation.
diff --git a/setup.py b/setup.py
index c1de879..dfba843 100644
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,12 @@ setup(
         "Documentation": "https://docs.tutor.overhang.io/",
         "Code": "https://github.com/overhangio/tutor-xqueue",
         "Issue tracker": "https://github.com/overhangio/tutor-xqueue/issues",
-        "Community": "https://discuss.overhang.io",
+        "Community": "https://discuss.openedx.org",
     },
     license="AGPLv3",
-    author="Overhang.io",
+    author="Overhang.IO",
     author_email="contact@overhang.io",
+    maintainer="eduNEXT",
     description="A Tutor plugin for Xqueue (external grading system)",
     long_description=readme,
     long_description_content_type="text/x-rst",