diff --git a/dev-java/htmlcleaner/metadata.xml b/dev-java/htmlcleaner/metadata.xml
index 580cafc879df1..c1a63678b5f1b 100644
--- a/dev-java/htmlcleaner/metadata.xml
+++ b/dev-java/htmlcleaner/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>HtmlCleaner is an open source HTML parser written in Java. HTML found on the Web is usually dirty, ill-formed and unsuitable for further processing. For any serious consumption of such documents, it is necessary to first clean up the mess and bring some order to the tags, attributes and ordinary text. For any given HTML document, HtmlCleaner reorders individual elements and produces well-formed XML. By default, it follows similar rules that the most of web browsers use in order to create the Document Object Model. However, you can provide custom tag and rule sets for tag filtering and balancing.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">htmlcleaner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PyPDF2/metadata.xml b/dev-python/PyPDF2/metadata.xml
index d8f3f772b0e3c..dfc8e7ea6a379 100644
--- a/dev-python/PyPDF2/metadata.xml
+++ b/dev-python/PyPDF2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="pypi">PyPDF2</remote-id>
+    <remote-id type="github">mstamy2/PyPDF2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-runner/metadata.xml b/dev-python/pytest-runner/metadata.xml
index 1126db8916818..cabdc38ae25ca 100644
--- a/dev-python/pytest-runner/metadata.xml
+++ b/dev-python/pytest-runner/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">pytest-runner</remote-id>
+    <remote-id type="bitbucket">pytest-dev/pytest-runner</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
index 610e1b9f018f4..c03bc60f51c14 100644
--- a/dev-python/pywavelets/metadata.xml
+++ b/dev-python/pywavelets/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<herd>python</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <herd>python</herd>
+  <longdescription lang="en">
   PyWavelets is a Python wavelet transforms module that can perform:
   * Discrete Wavelet Transform (1D and 2D)
   * Inverse Discrete Wavelet Transform (1D and 2D)
   * Stationary Wavelet Transform
   * Wavelet Packets decomposition and reconstruction
 </longdescription>
-<upstream>
-  <remote-id type="pypi">PyWavelets</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">PyWavelets</remote-id>
+    <remote-id type="github">PyWavelets/pywt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml
index bc830d6793235..659c8799ebc7a 100644
--- a/dev-python/sphinxcontrib-newsfeed/metadata.xml
+++ b/dev-python/sphinxcontrib-newsfeed/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-newsfeed</remote-id>
+		<remote-id type="bitbucket">prometheus/sphinxcontrib-newsfeed</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml
index 022082634a534..f3a1574526a8b 100644
--- a/dev-python/sphinxcontrib-spelling/metadata.xml
+++ b/dev-python/sphinxcontrib-spelling/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
+		<remote-id type="bitbucket">dhellmann/sphinxcontrib-spelling</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
index 4a252355a3b05..3cbbb7bde1f4c 100644
--- a/www-servers/xsp/metadata.xml
+++ b/www-servers/xsp/metadata.xml
@@ -7,6 +7,9 @@
 		your ASP.NET applications.
 	</longdescription>
 	<use>
-		<flag name='developer'>creates .mdb files for either Release and Debug</flag>
+		<flag name="developer">creates .mdb files for either Release and Debug</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">mono/xsp</remote-id>
+	</upstream>
 </pkgmetadata>