diff --git a/packages/xo-collection/README.md b/packages/xo-collection/README.md
index 7456895d4..f455771a1 100644
--- a/packages/xo-collection/README.md
+++ b/packages/xo-collection/README.md
@@ -1,4 +1,4 @@
-# xo-collection [![Build Status](https://travis-ci.org/marsaud/collection.png?branch=master)](https://travis-ci.org/marsaud/collection)
+# xo-collection [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
 
 > Generic in-memory collection with events
 
@@ -256,7 +256,7 @@ the code.
 
 You may:
 
-- report any [issue](https://github.com/marsaud/collection/issues)
+- report any [issue](https://github.com/vatesfr/xo-web/issues)
   you've encountered;
 - fork and create a pull request.
 
diff --git a/packages/xo-collection/package.json b/packages/xo-collection/package.json
index 1e067b9f7..f316d7798 100644
--- a/packages/xo-collection/package.json
+++ b/packages/xo-collection/package.json
@@ -4,11 +4,11 @@
   "license": "ISC",
   "description": "Generic in-memory collection with events",
   "keywords": [],
-  "homepage": "https://github.com/marsaud/collection",
-  "bugs": "https://github.com/marsaud/collection/issues",
+  "homepage": "https://github.com/vatesfr/xen-orchestra",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/marsaud/collection.git"
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
   "author": {
     "name": "Fabrice Marsaud",
diff --git a/packages/xo-common/README.md b/packages/xo-common/README.md
index 987ed83fd..b4575527d 100644
--- a/packages/xo-common/README.md
+++ b/packages/xo-common/README.md
@@ -1,4 +1,4 @@
-# xo-common [![Build Status](https://travis-ci.org/vatesfr/xo-common.png?branch=master)](https://travis-ci.org/vatesfr/xo-common)
+# xo-common [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
 
 > Code shared between [XO](https://xen-orchestra.com) server and clients
 
@@ -40,7 +40,7 @@ the code.
 
 You may:
 
-- report any [issue](https://github.com/vatesfr/xo-common/issues)
+- report any [issue](https://github.com/vatesfr/xo-web/issues)
   you've encountered;
 - fork and create a pull request.
 
diff --git a/packages/xo-common/package.json b/packages/xo-common/package.json
index 528ec4b25..50c23c373 100644
--- a/packages/xo-common/package.json
+++ b/packages/xo-common/package.json
@@ -4,11 +4,11 @@
   "license": "AGPL-3.0",
   "description": "Code shared between [XO](https://xen-orchestra.com) server and clients",
   "keywords": [],
-  "homepage": "https://github.com/vatesfr/xo-common",
-  "bugs": "https://github.com/vatesfr/xo-common/issues",
+  "homepage": "https://github.com/vatesfr/xen-orchestra",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vatesfr/xo-common.git"
+    "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
   "author": {
     "name": "Julien Fontanet",
diff --git a/packages/xo-lib/README.md b/packages/xo-lib/README.md
index 183f848ba..bf1c97812 100644
--- a/packages/xo-lib/README.md
+++ b/packages/xo-lib/README.md
@@ -1,4 +1,4 @@
-# xo-lib [![Build Status](https://travis-ci.org/vatesfr/xo-lib.png?branch=master)](https://travis-ci.org/vatesfr/xo-lib)
+# xo-lib [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
 
 > Library to connect to XO-Server.
 
@@ -159,7 +159,7 @@ the code.
 
 You may:
 
-- report any [issue](https://github.com/vatesfr/xo-lib/issues)
+- report any [issue](https://github.com/vatesfr/xo-web/issues)
   you've encountered;
 - fork and create a pull request.
 
diff --git a/packages/xo-lib/package.json b/packages/xo-lib/package.json
index 7be7b615b..e6f36886e 100644
--- a/packages/xo-lib/package.json
+++ b/packages/xo-lib/package.json
@@ -8,11 +8,11 @@
     "orchestra",
     "xen-orchestra"
   ],
-  "homepage": "https://github.com/vatesfr/xo-lib",
-  "bugs": "https://github.com/vatesfr/xo-lib/issues",
+  "homepage": "https://github.com/vatesfr/xen-orchestra",
+  "bugs": "https://github.com/vatesfr/xo-web/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vatesfr/xo-lib"
+    "url": "https://github.com/vatesfr/xen-orchestra"
   },
   "author": {
     "name": "Julien Fontanet",
diff --git a/packages/xo-remote-parser/package.json b/packages/xo-remote-parser/package.json
index 95966ce14..d8c1e4e32 100644
--- a/packages/xo-remote-parser/package.json
+++ b/packages/xo-remote-parser/package.json
@@ -8,7 +8,7 @@
   "bugs": "",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vatesfr/xo-remote-parser"
+    "url": "https://github.com/vatesfr/xen-orchestra"
   },
   "author": {
     "name": "Fabrice Marsaud",