diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md
index c5c7cc1d746a50..55aafd02ad2b0a 100644
--- a/WORKING_GROUPS.md
+++ b/WORKING_GROUPS.md
@@ -26,6 +26,7 @@ back in to the TC.
 * [Evangelism](#evangelism)
 * [Roadmap](#roadmap)
 * [Docker](#docker)
+* [Addon API](#addon-api)
 * [Starting a Working Group](#starting-a-wg)
 * [Bootstrap Governance](#bootstrap-governance)
 
@@ -179,7 +180,7 @@ Their responsibilities are:
 * Maintain and improve the images' documentation.
 
 
-### Addon API
+### [Addon API](https://github.com/iojs/nan)
 
 The Addon API Working Group is responsible for maintaining the NAN project and
 corresponding _nan_ package in npm. The NAN project makes available an
@@ -189,9 +190,9 @@ versions of Node.js, io.js, V8 and libuv.
 
 Their responsibilities are:
 
-* Maintaining the [NAN](https://github.com/rvagg/nan) GitHub repository,
+* Maintaining the [NAN](https://github.com/iojs/nan) GitHub repository,
   including code, issues and documentation.
-* Maintaining the [addon-examples](https://github.com/rvagg/node-addon-examples)
+* Maintaining the [addon-examples](https://github.com/iojs/node-addon-examples)
   GitHub repository, including code, issues and documentation.
 * Maintaining the C++ Addon API within the io.js project, in subordination to
   the io.js TC.
@@ -202,7 +203,7 @@ Their responsibilities are:
   community advance notice of changes.
 
 The current members can be found in their
-[README](https://github.com/rvagg/nan#collaborators).
+[README](https://github.com/iojs/nan#collaborators).
 
 ## Starting a WG