diff --git a/README.rst b/README.rst
index c21eb8f..7792621 100644
--- a/README.rst
+++ b/README.rst
@@ -126,6 +126,11 @@ Then build the lab image again::
 
 You should now be able to run ``import matplotlib`` statements within your Jupyter notebooks.
 
+Troubleshooting
+---------------
+
+This Tutor plugin is maintained by Muhammad Hassan Siddiqi from `Edly <https://edly.io>`__. 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.
+
 License
 -------
 
diff --git a/setup.py b/setup.py
index 9ab0ae1..137c7ef 100644
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@ def load_about():
     },
     license="AGPLv3",
     author="Overhang.IO",
-    maintainer="Régis Behmo",
-    maintainer_email="regis@overhang.io",
+    maintainer="Edly",
+    maintainer_email="mhassan.eeng@gmail.com",
     description="Jupyter Notebook plugin for Tutor",
     long_description=load_readme(),
     packages=find_packages(exclude=["tests*"]),