diff --git a/Makefile.config b/Makefile.config
index 6f7324069..1e4352b9d 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -39,7 +39,7 @@ else
         $(info Note: Building without ia32 C/R, missed ia32 support in gcc)
         $(info $(info)      That may be related to missing gcc-multilib in your)
         $(info $(info)      distribution or you may have Debian with buggy toolchain)
-        $(info $(info)      (issue https://github.com/xemul/criu/issues/315))
+        $(info $(info)      (issue https://github.com/checkpoint-restore/criu/issues/315))
 endif
 endif
 
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 61ab09387..d7915f99c 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -25,7 +25,7 @@
 /*
  * It's a workaround for a kernel bug. In the 3.19 kernel when pagemap are read
  * for a few vma-s for one read call, it returns incorrect data.
- * https://github.com/xemul/criu/issues/207
+ * https://github.com/checkpoint-restore/criu/issues/207
 */
 static bool pagemap_cache_disabled;
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 9a179ef8b..387a976da 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -293,7 +293,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 	args->uids[3] = sys_setfsuid(-1L);
 
 	/*
-	 * FIXME In https://github.com/xemul/criu/issues/95 it is
+	 * FIXME In https://github.com/checkpoint-restore/criu/issues/95 it is
 	 * been reported that only low 16 bits are set upon syscall
 	 * on ARMv7.
 	 *
diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
index 60fef6a07..f40588142 100644
--- a/scripts/crit-setup.py
+++ b/scripts/crit-setup.py
@@ -5,7 +5,7 @@ setup(name = "crit",
       description = "CRiu Image Tool",
       author = "CRIU team",
       author_email = "criu@openvz.org",
-      url = "https://github.com/xemul/criu",
+      url = "https://github.com/checkpoint-restore/criu",
       package_dir = {'pycriu': 'lib/py'},
       packages = ["pycriu", "pycriu.images"],
       scripts = ["crit/crit"]
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index c055860fd..980d74734 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -100,7 +100,7 @@ umask 0000
 export SKIP_PREP=1
 # The 3.19 kernel (from Ubuntu 14.04) has a bug. When /proc/PID/pagemap
 # is read for a few VMAs in one read call, incorrect data is returned.
-# See https://github.com/xemul/criu/issues/207
+# See https://github.com/checkpoint-restore/criu/issues/207
 # Kernel 4.4 (from Ubuntu 14.04.5 update) fixes this.
 uname -r | grep -q ^3\.19 && export CRIU_PMC_OFF=1