diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index e8db975..277ba6f 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -23,4 +23,7 @@
 		<flag name="cron">Installs cron file</flag>
 		<flag name="selinux">Installs Security Enhanced Linux support</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:logrotate_project:logrotate</flag>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 6700e72..694c0de 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -15,5 +15,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Cyan4973/lz4</remote-id>
+		<remote-id type="cpe">cpe:/a:lz4_project:lz4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/rhash/metadata.xml b/app-crypt/rhash/metadata.xml
index a6651d8..90dd65a 100644
--- a/app-crypt/rhash/metadata.xml
+++ b/app-crypt/rhash/metadata.xml
@@ -8,6 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">rhash</remote-id>
 		<remote-id type="github">rhash/RHash</remote-id>
+		<remote-id type="cpe">cpe:/a:rhash_project:rhash</remote-id>
 		<bugs-to>https://github.com/rhash/RHash/issues</bugs-to>
 	</upstream>
 	<longdescription lang="en">
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
index ef99824..3979743 100644
--- a/app-editors/vim-core/metadata.xml
+++ b/app-editors/vim-core/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vim/vim</remote-id>
+		<remote-id type="cpe">cpe:/a:vim:vim</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index a836797..5cc01d8 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -13,4 +13,7 @@
   <use>
     <flag name="python">Install a more powerful/faster version of lddtree</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gentoo:pax-utils</flag>
+</upstream>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index 496b9d3..dc0ec12 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
 	<email>vapier@gentoo.org</email>
 </maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index 55f7715..03bcddc 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -14,5 +14,6 @@
   </longdescription>
   <upstream>
     <remote-id type="github">json-c/json-c</remote-id>
+    <remote-id type="cpe">cpe:/a:json-c_project:json-c</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index 89e9849..552088c 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:libgpg-error</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 6842acb..125e4a5 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -33,6 +33,7 @@
 	<upstream>
 		<bugs-to>https://github.com/libuv/libuv/issues</bugs-to>
 		<remote-id type="github">libuv/libuv</remote-id>
+		<remote-id type="cpe">cpe:/a:libuv:libuv</remote-id>
 	</upstream>
 	<slots>
 		<subslots>Reflect ABI compatibility of libuv.so.</subslots>
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
index 3e60a9a..daddb6b 100644
--- a/dev-libs/popt/metadata.xml
+++ b/dev-libs/popt/metadata.xml
@@ -5,4 +5,7 @@
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
   </maintainer>
+        <upstream>
+                <remote-id type="cpe">cpe:/a:popt_project:popt</remote-id>
+        </upstream>
 </pkgmetadata>
diff --git a/dev-python/enum34/metadata.xml b/dev-python/enum34/metadata.xml
index f3d094a..8dc3aa3 100644
--- a/dev-python/enum34/metadata.xml
+++ b/dev-python/enum34/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">enum34</remote-id>
+    <remote-id type="cpe">cpe:/a:python:enum34</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 03be641..bedc0a8 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">Jinja2</remote-id>
     <remote-id type="github">pallets/jinja</remote-id>
+    <remote-id type="cpe">cpe:/a:palletsprojects:jinja</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index 4497991..037166d 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -9,5 +9,6 @@
 		<remote-id type="pypi">pyOpenSSL</remote-id>
 		<remote-id type="launchpad">pyopenssl</remote-id>
 		<remote-id type="sourceforge">pyopenssl</remote-id>
+		<remote-id type="cpe">cpe:/a:pyopenssl:pyopenssl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index 98375f2..79464ec 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="libyaml">enable support for C implementation using libyaml</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index 7f45ae4..6d040d3 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -13,5 +13,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">requests</remote-id>
+    <remote-id type="cpe">cpe:/a:python-requests:requests</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/setuptools/metadata.xml b/dev-python/setuptools/metadata.xml
index 3620f42..e33e5a8 100644
--- a/dev-python/setuptools/metadata.xml
+++ b/dev-python/setuptools/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">setuptools</remote-id>
     <remote-id type="github">pypa/setuptools</remote-id>
+    <remote-id type="cpe">cpe:/a:python:setuptools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index de0d93d..46f060b 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">urllib3</remote-id>
     <remote-id type="github">shazow/urllib3</remote-id>
+    <remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
index 1fc58cc..0093ef8 100644
--- a/dev-util/re2c/metadata.xml
+++ b/dev-util/re2c/metadata.xml
@@ -10,5 +10,6 @@
 	<upstream>
 		<remote-id type="sourceforge">re2c</remote-id>
 		<remote-id type="github">skvadrik/re2c</remote-id>
+		<remote-id type="cpe">cpe:/a:re2c:re2c</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 53353ad..190cb48 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -38,4 +38,7 @@
     <flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
     <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:git:git</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 2881780..803e0cb 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -8,5 +8,6 @@
 	<longdescription>the network swiss army knife</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nc110</remote-id>
+		<remote-id type="cpe">cpe:/a:netcat_project:netcat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index 0464212..cc14422 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -7,5 +7,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ebtables</remote-id>
+		<remote-id type="cpe">cpe:/a:netfilter:ebtables</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index f368136..01c0462 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -17,4 +17,7 @@
 		</flag>
 		<flag name="sasl">Enable SASL support in the LDAP module</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:ibm:autofs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index 2c14dbf..d83cb91 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -7,5 +7,6 @@
 </maintainer>
 <upstream>
 	<bugs-to>http://bugs.gw.com/</bugs-to>
+	<remote-id type="cpe">cpe:/a:file_project:file</upstream>
 </upstream>
 </pkgmetadata>
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 56c1244..48988ed 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:less</upstream>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index 504b6a5..e104c64 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <upstream>
 	<remote-id type="sourceforge">sed</remote-id>
+	<remote-id type="cpe">cpe:/a:gnu:sed</remote-id>
 </upstream>
 <use>
 	<flag name="forced-sandbox">
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index 56c1244..e9b127f 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:texinfo</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
index 96a2d58..b188d01 100644
--- a/sys-devel/automake/metadata.xml
+++ b/sys-devel/automake/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:automake</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index 6f7c81d..be9974e 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="sourceforge">flex</remote-id>
 		<remote-id type="github">westes/flex</remote-id>
+		<remote-id type="cpe">cpe:/a:flex_project:flex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 7844da8..127047a 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -15,4 +15,7 @@
 		this requires git at runtime, but will be faster/smaller than raw archives
 	</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:texinfo</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml
index 56c1244..578976c 100644
--- a/sys-devel/make/metadata.xml
+++ b/sys-devel/make/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:make</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml
index 56c1244..a3b432e 100644
--- a/sys-devel/patch/metadata.xml
+++ b/sys-devel/patch/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:patch</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-fs/mdadm/metadata.xml b/sys-fs/mdadm/metadata.xml
index 56c1244..6923416 100644
--- a/sys-fs/mdadm/metadata.xml
+++ b/sys-fs/mdadm/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mdadm_project:mdadm</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml
index 56f0df8..f30f15d 100644
--- a/sys-libs/libseccomp/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -5,5 +5,6 @@
 	<upstream>
 		<remote-id type="github">seccomp/libseccomp</remote-id>
 		<remote-id type="sourceforge">libseccomp</remote-id>
+		<remote-id type="cpe">cpe:/a:libseccomp_project:libseccomp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index 263e639..c0aa0de 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -13,5 +13,6 @@
 </use>
 <upstream>
 	<remote-id type="sourceforge">procps</remote-id>
+	<remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
 </upstream>
 </pkgmetadata>