diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html
index f53bcdf2cc0..cb66585c54e 100644
--- a/ckan/templates/footer.html
+++ b/ckan/templates/footer.html
@@ -13,7 +13,7 @@
             {% block footer_links_ckan %}
               {% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
               <li><a href="{{ api_url }}">{{ _('CKAN API') }}</a></li>
-              <li><a href="http://www.okfn.org/">{{ _('Open Knowledge International') }}</a></li>
+              <li><a href="http://www.ckan.org/">{{ _('CKAN Association') }}</a></li>
               <li><a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}"></a></li>
             {% endblock %}
           </ul>
diff --git a/doc/_templates/footer.html b/doc/_templates/footer.html
index 4fb97f305e1..6fa22a2fd7b 100644
--- a/doc/_templates/footer.html
+++ b/doc/_templates/footer.html
@@ -17,7 +17,7 @@
 
   <hr></hr>
 
-  <p>An <a href="http://okfn.org">Open Knowledge Foundation</a> project.</p>
+  <p>Support the <a href="http://ckan.org">CKAN Association</a>.</p>
 
   <p class="copyright">
     {%- if show_copyright %}
diff --git a/doc/conf.py b/doc/conf.py
index a8e2b8503ef..635dba13f16 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -331,7 +331,7 @@ def write_latest_release_file():
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
   ('contents', 'CKAN.tex', ur'CKAN documentation',
-   ur'Open Knowledge Foundation', 'manual'),
+   ur'CKAN contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/setup.py b/setup.py
index fa3d92124f7..8ad0809b4b9 100644
--- a/setup.py
+++ b/setup.py
@@ -167,8 +167,8 @@
 setup(
     name='ckan',
     version=__version__,
-    author='Open Knowledge Foundation',
-    author_email='info@okfn.org',
+    author='https://github.com/ckan/ckan/graphs/contributors',
+    author_email='info@ckan.org',
     license=__license__,
     url='http://ckan.org/',
     description=__description__,