diff --git a/README.md b/README.md
index b7eff5b..f833342 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@ flying-squid
 ================
 
 [![NPM version](https://img.shields.io/npm/v/flying-squid.svg)](http://npmjs.com/package/flying-squid)
-[![Join the chat at https://gitter.im/mhsjlw/flying-squid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mhsjlw/flying-squid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/PrismarineJS/flying-squid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PrismarineJS/flying-squid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Minecraft version](https://img.shields.io/badge/minecraft%20version-1.8-brightgreen.svg)](http://wiki.vg/Protocol)
-[![Github issues](https://img.shields.io/github/issues/mhsjlw/flying-squid.svg)](https://img.shields.io/github/issues/mhsjlw/flying-squid.svg)
-[![Build Status](https://img.shields.io/circleci/project/mhsjlw/flying-squid/master.svg)](https://circleci.com/gh/mhsjlw/flying-squid)
+[![Github issues](https://img.shields.io/github/issues/PrismarineJS/flying-squid.svg)](https://img.shields.io/github/issues/PrismarineJS/flying-squid.svg)
+[![Build Status](https://img.shields.io/circleci/project/PrismarineJS/flying-squid/master.svg)](https://circleci.com/gh/PrismarineJS/flying-squid)
 [![Gratipay](https://img.shields.io/gratipay/mhsjlw.svg)](https://gratipay.com/~mhsjlw/)
 
 A semi-functional minecraft server in Node.js
diff --git a/package.json b/package.json
index a48689e..97078bb 100644
--- a/package.json
+++ b/package.json
@@ -49,10 +49,10 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/mhsjlw/flying-squid.git"
+    "url": "git://github.com/PrismarineJS/flying-squid.git"
   },
   "bugs": {
-    "url": "http://github.com/mhsjlw/flying-squid/issues"
+    "url": "http://github.com/PrismarineJS/flying-squid/issues"
   },
   "devDependencies": {
     "babel": "5.8.23",
diff --git a/src/lib/plugins/commands.js b/src/lib/plugins/commands.js
index b48d91e..ee58edf 100644
--- a/src/lib/plugins/commands.js
+++ b/src/lib/plugins/commands.js
@@ -90,7 +90,7 @@ module.exports.player=function(player, serv) {
     info: 'to bug report',
     usage: '/bug',
     action() {
-      return 'Report bugs / issues here: https://github.com/mhsjlw/flying-squid/issues';
+      return 'Report bugs / issues here: https://github.com/PrismarineJS/flying-squid/issues';
     }
   });