diff --git a/CHANGELOG b/CHANGELOG
index c7703090..03bfb299 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,7 +19,7 @@
 - Support basic ad-hoc commands(xep-0050) (/command)
 - Add option to trust server's certificate (/connect, /account)
 - Add possibility to close windows via prof_win_close inputrc hook
-- Bug fixes: https://github.com/boothj5/profanity/milestone/16?closed=1
+- Bug fixes: https://github.com/profanity-im/profanity/milestone/16?closed=1
 
 0.5.1
 =====
@@ -33,7 +33,7 @@
 - Add encryption settings functions to plugins api
 - Allow plugins to block message sending on pre message send hooks
 - Fix CVE-2017-5592 (incorrect implementation of Message Carbons allowing social engineering attacks)
-- Bug fixes: https://github.com/boothj5/profanity/milestone/15?closed=1
+- Bug fixes: https://github.com/profanity-im/profanity/milestone/15?closed=1
 
 0.5.0
 =====
diff --git a/Makefile.am b/Makefile.am
index f4cbfd50..832ff045 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,9 +248,9 @@ tests_unittests_unittests_SOURCES = $(unittest_sources)
 tests_unittests_unittests_LDADD = -lcmocka
 
 # Functional test were commented out because of:
-# https://github.com/boothj5/profanity/pull/1010
+# https://github.com/profanity-im/profanity/pull/1010
 # An issue was raised for stabber:
-# https://github.com/boothj5/stabber/issues/5
+# https://github.com/profanity-im/stabber/issues/5
 # Once this issue is resolved functional tests should be enabled again
 #
 #if HAVE_STABBER
diff --git a/README.md b/README.md
index 00fcdbeb..73adb4a1 100644
--- a/README.md
+++ b/README.md
@@ -16,4 +16,4 @@ Mailing List: https://groups.google.com/forum/#!forum/profanitydev
 
 MUC: profanity@rooms.dismail.de
 
-Plugins repository: https://github.com/boothj5/profanity-plugins
+Plugins repository: https://github.com/profanity-im/profanity-plugins
diff --git a/RELEASE_GUIDE.md b/RELEASE_GUIDE.md
index 90595583..d39eee41 100644
--- a/RELEASE_GUIDE.md
+++ b/RELEASE_GUIDE.md
@@ -68,5 +68,5 @@ PACKAGE_STATUS="development"
 
 ## Updating website
   * Make changes to the git repo incuding uploading the new artefacts at:
-        https://github.com/boothj5/www_profanity_im
+        https://github.com/profanity-im/profanity-im.github.io
   * Email boothj5web@gmail.com to get them published to the website
diff --git a/configure.ac b/configure.ac
index 4f6a6790..caeb9886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
-# TODO Introduce with Ruby plugins, see https://github.com/boothj5/profanity/issues/779
+# TODO Introduce with Ruby plugins, see https://github.com/profanity-im/profanity/issues/779
 #AX_PREFIX_CONFIG_H([src/prof_config.h], [PROF], [src/config.h])
 
 ### Checks for programs.
diff --git a/docs/profanity.1 b/docs/profanity.1
index 0a23fa80..5900c79e 100644
--- a/docs/profanity.1
+++ b/docs/profanity.1
@@ -45,7 +45,7 @@ is stored in
 Bugs can either be reported by raising an issue at the Github issue tracker:
 .br
 .PP
-<https://github.com/boothj5/profanity/issues>
+<https://github.com/profanity-im/profanity/issues>
 .br
 .PP
 or to the mailing list at:
@@ -68,4 +68,4 @@ There is NO WARRANTY, to the extent permitted by law.
 .B Profanity
 was written by James Booth
 .B <boothj5web@gmail.com>
-with many contributions from others, see the full list at: <https://github.com/boothj5/profanity/graphs/contributors>
+with many contributions from others, see the full list at: <https://github.com/profanity-im/profanity/graphs/contributors>