diff --git a/docs/coreteam.rst b/docs/coreteam.rst
new file mode 100644
index 0000000..02b9c30
--- /dev/null
+++ b/docs/coreteam.rst
@@ -0,0 +1,14 @@
+* `Julien Danjou <https://github.com/jd>`_
+* `Morten Linderud <https://github.com/Foxboron>`_
+* `J Kenneth King <https://github.com/agentultra>`_
+* `Gergely Nagy <https://github.com/algernon>`_
+* `Tuukka Turto <https://github.com/tuturto>`_
+* `Karen Rustad <https://github.com/aldeka>`_
+* `Abhishek L <https://github.com/theanalyst>`_
+* `Christopher Allan Webber <https://github.com/cwebber>`_
+* `Konrad Hinsen <https://github.com/khinsen>`_
+* `Will Kahn-Greene <https://github.com/willkg>`_
+* `Paul Tagliamonte <https://github.com/paultag>`_
+* `Nicolas Dandrimont <https://github.com/olasd>`_
+* `Bob Tolbert <https://github.com/rwtolbert>`_
+* `Berker Peksag <https://github.com/berkerpeksag>`_
diff --git a/docs/hacking.rst b/docs/hacking.rst
index 08a1fe6..6ee479c 100644
--- a/docs/hacking.rst
+++ b/docs/hacking.rst
@@ -99,3 +99,11 @@ core team. Additional review is clearly welcome, but we need a minimum of
 If a core member is sending in a PR, please find 2 core members that don't
 include them PR submitter. The idea here is that one can work with the PR
 author, and a second acks the entire change set.
+
+
+Core Team
+=========
+
+Core development team of hy consists of following developers.
+
+.. include:: coreteam.rst
diff --git a/hy/completer.py b/hy/completer.py
index d32deaf..05ac88f 100644
--- a/hy/completer.py
+++ b/hy/completer.py
@@ -41,7 +41,7 @@ except ImportError:
     except ImportError:
         docomplete = False
 
-if sys.platform == 'darwin':
+if sys.platform == 'darwin' and 'libedit' in readline.__doc__:
     readline_bind = "bind ^I rl_complete"
 else:
     readline_bind = "tab: complete"
diff --git a/scripts/update_coreteam.py b/scripts/update_coreteam.py
new file mode 100644
index 0000000..dda9754
--- /dev/null
+++ b/scripts/update_coreteam.py
@@ -0,0 +1,45 @@
+"""
+You need to install the requests package first::
+
+    $ pip install requests
+
+"""
+
+import os.path
+import requests
+
+API_URL = 'https://api.github.com/%s'
+
+RST_FORMAT = '* `%s <%s>`_'
+MISSING_NAMES = {
+    'khinsen': 'Konrad Hinsen',
+}
+# We have three concealed members on the hylang organization
+# and GitHub only shows public members if the requester is not
+# an owner of the organization.
+CONCEALED_MEMBERS = [
+    ('aldeka', 'Karen Rustad'),
+    ('rwtolbert', 'Bob Tolbert'),
+    ('tuturto', 'Tuukka Turto'),
+]
+
+
+def get_dev_name(login):
+    name = requests.get(API_URL % 'users/' + login).json()['name']
+    if not name:
+        return MISSING_NAMES.get(login)
+    return name
+
+coredevs = requests.get(API_URL % 'orgs/hylang/members')
+
+result = set()
+for dev in coredevs.json():
+    result.add(RST_FORMAT % (get_dev_name(dev['login']), dev['html_url']))
+
+for login, name in CONCEALED_MEMBERS:
+    result.add(RST_FORMAT % (name, 'https://github.com/' + login))
+
+filename = os.path.abspath(os.path.join(os.path.pardir,
+                                        'docs', 'coreteam.rst'))
+with open(filename, 'w+') as fobj:
+    fobj.write('\n'.join(result) + '\n')