diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
index 62c6d9582e0e3..ba093b34f5d63 100644
--- a/dev-haskell/pcap/metadata.xml
+++ b/dev-haskell/pcap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
@@ -7,5 +7,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">bos/pcap</remote-id>
+		<remote-id type="bitbucket">bos/pcap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
index 6f7433b7ee2d0..f187cf86093fd 100644
--- a/dev-haskell/text-icu/metadata.xml
+++ b/dev-haskell/text-icu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
@@ -31,5 +31,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">bos/text-icu</remote-id>
+		<remote-id type="bitbucket">bos/text-icu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index b44d050a27bb6..edc007d2b578d 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>
   <upstream>
     <remote-id type="github">mmottl/sqlite3-ocaml</remote-id>
+    <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index edc60f4c91d0c..c33bef4727284 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>
   <upstream>
     <remote-id type="github">mmottl/pcre-ocaml</remote-id>
+    <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml
index 58b8f62421ba4..2aa45d7c3544d 100644
--- a/dev-ml/pomap/metadata.xml
+++ b/dev-ml/pomap/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>
   <upstream>
     <remote-id type="github">mmottl/pomap</remote-id>
+    <remote-id type="bitbucket">mmottl/pomap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml
index c959f120f888e..d80e52b82be5c 100644
--- a/dev-ml/postgresql-ocaml/metadata.xml
+++ b/dev-ml/postgresql-ocaml/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>
   <upstream>
     <remote-id type="github">mmottl/postgresql-ocaml</remote-id>
+    <remote-id type="bitbucket">mmottl/postgresql-ocaml</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml
index f7272010a4412..49b53ef8eeede 100644
--- a/dev-ml/res/metadata.xml
+++ b/dev-ml/res/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>
   <upstream>
     <remote-id type="github">mmottl/res</remote-id>
+    <remote-id type="bitbucket">mmottl/res</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index bc93959923a82..901728f86b40a 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
+    <remote-id type="bitbucket">jpellerin/nose</remote-id>
   </upstream>
 </pkgmetadata>