diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 277ba6f..4e9f402 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -24,6 +24,6 @@
 		<flag name="selinux">Installs Security Enhanced Linux support</flag>
 	</use>
 	<upstream>
-		<remote-id type="cpe">cpe:/a:logrotate_project:logrotate</flag>
+		<remote-id type="cpe">cpe:/a:logrotate_project:logrotate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index 5cc01d8..c98d478 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -14,6 +14,6 @@
     <flag name="python">Install a more powerful/faster version of lddtree</flag>
   </use>
   <upstream>
-    <remote-id type="cpe">cpe:/a:gentoo:pax-utils</flag>
+    <remote-id type="cpe">cpe:/a:gentoo:pax-utils</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 12dd2df..e6cfde4 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -9,4 +9,7 @@
 	<email>kde@gentoo.org</email>
 	<name>Gentoo KDE Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:nih:libzip</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-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index c5d121a..e237249 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="server">Enable cmake-server support.</flag>
 		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:cmake_project:cmake </remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 188bf47..9797930 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -13,4 +13,7 @@
 	<flag name="tools">Install module loading/unloading tools.</flag>
 	<flag name="zlib">Enable support for gzipped modules</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:kernel:kmod</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 56c1244..37201d4 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/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:libcap-ng_project:libcap-ng</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml
index b31e5b3..03ce6dc 100644
--- a/sys-libs/libseccomp/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -8,5 +8,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>