diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75a0966..dabe9fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 ### 2.3.2 (Next)
 
-* [#23](https://github.com/matt-kruse/alexa-app-server/pull/23): Added `server.stop()` - [@dblock](https://github.com/dblock).
-* [#23](https://github.com/matt-kruse/alexa-app-server/pull/23): Added LICENSE - [@dblock](https://github.com/dblock).
-* [#23](https://github.com/matt-kruse/alexa-app-server/pull/23): Added tests - [@dblock](https://github.com/dblock).
+* [#28](https://github.com/alexa-js/alexa-app-server/pull/28): Moved to the [alexa-js organization](https://github.com/alexa-js) - [@dblock](https://github.com/dblock).
+* [#23](https://github.com/alexa-js/alexa-app-server/pull/23): Added `server.stop()` - [@dblock](https://github.com/dblock).
+* [#23](https://github.com/alexa-js/alexa-app-server/pull/23): Added LICENSE - [@dblock](https://github.com/dblock).
+* [#23](https://github.com/alexa-js/alexa-app-server/pull/23): Added tests - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 2.3.1 (Dec 3, 2016)
@@ -13,12 +14,12 @@
 
 ### 2.3.0 (Nov 28, 2016)
 
-* [#2](https://github.com/matt-kruse/alexa-app-server/pull/2): Added view for custom slot types - [@rickwargo](https://github.com/rickwargo).
-* [#14](https://github.com/matt-kruse/alexa-app-server/pull/2): Added support for alexa-verifier - [@TomMettam](https://github.com/TomMettam).
+* [#2](https://github.com/alexa-js/alexa-app-server/pull/2): Added view for custom slot types - [@rickwargo](https://github.com/rickwargo).
+* [#14](https://github.com/alexa-js/alexa-app-server/pull/2): Added support for alexa-verifier - [@TomMettam](https://github.com/TomMettam).
 
 ### 2.2.4 (Sep 13, 2015)
 
-* [#1](https://github.com/matt-kruse/alexa-app-server/pull/1): Added HTTPS Support - [@parisbutterfield](https://github.com/parisbutterfield).
+* [#1](https://github.com/alexa-js/alexa-app-server/pull/1): Added HTTPS Support - [@parisbutterfield](https://github.com/parisbutterfield).
 
 ### 2.2.3 (Aug 19, 2015)
 
diff --git a/README.md b/README.md
index 2945d2f..1ce5577 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 An Alexa App (Skill) Server module using Node.js and the [alexa-app](https://www.npmjs.com/package/alexa-app) module.
 
 [![NPM](https://img.shields.io/npm/v/alexa-app-server.svg)](https://www.npmjs.com/package/alexa-app-server/)
-[![Build Status](https://travis-ci.org/matt-kruse/alexa-app-server.svg?branch=master)](https://travis-ci.org/matt-kruse/alexa-app-server)
+[![Build Status](https://travis-ci.org/alexa-js/alexa-app-server.svg?branch=master)](https://travis-ci.org/alexa-js/alexa-app-server)
 
 ## Installation
 
diff --git a/package.json b/package.json
index 91717a5..45c265a 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,10 @@
     "author": "Matt Kruse",
     "repository": {
         "type": "git",
-        "url": "https://github.com/matt-kruse/alexa-app-server.git"
+        "url": "https://github.com/alexa-js/alexa-app-server.git"
     },
     "bugs": {
-        "url": "https://github.com/matt-kruse/alexa-app-server/issues"
+        "url": "https://github.com/alexa-js/alexa-app-server/issues"
     },
     "scripts": {
         "test": "./node_modules/.bin/mocha"