diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 20ab9bf..92a6b5a 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Alexys Jacob</name>
 	</maintainer>
 	<upstream>
+  		<remote-id type="cpe">cpe:/a:mongodb:database_tools</remote-id>
 		<remote-id type="github">mongodb/mongo-tools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 1f55f5a..d770d31 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -14,10 +14,12 @@
 	and powerful queries).
 	</longdescription>
 	<use>
+		<flag name="clang">Use clang compiler instead of GCC</flag>
 		<flag name="mongosh">Install the MongoDB shell from <pkg>app-admin/mongosh-bin</pkg></flag>
 		<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...) from <pkg>app-admin/mongo-tools</pkg></flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:mongodb:mongodb</remote-id>
 		<remote-id type="github">mongodb/mongo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libbson/metadata.xml b/dev-libs/libbson/metadata.xml
index c01295d..e248162 100644
--- a/dev-libs/libbson/metadata.xml
+++ b/dev-libs/libbson/metadata.xml
@@ -6,6 +6,7 @@
     <name>Ultrabug</name>
   </maintainer>
   <upstream>
+  	<remote-id type="cpe">cpe:/a:mongodb:libbson</remote-id>
     <remote-id type="github">mongodb/mongo-c-driver</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libmongocrypt/metadata.xml b/dev-libs/libmongocrypt/metadata.xml
index 5e9e9af..fe0d53f 100644
--- a/dev-libs/libmongocrypt/metadata.xml
+++ b/dev-libs/libmongocrypt/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Alexys Jacob</name>
 	</maintainer>
 	<upstream>
+	  	<remote-id type="cpe">cpe:/a:mongodb:libmongocrypt</remote-id>
 		<remote-id type="github">mongodb/libmongocrypt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/mongo-c-driver/metadata.xml b/dev-libs/mongo-c-driver/metadata.xml
index ff90df0..9e7214b 100644
--- a/dev-libs/mongo-c-driver/metadata.xml
+++ b/dev-libs/mongo-c-driver/metadata.xml
@@ -12,6 +12,7 @@
 		</flag>
 	</use>
 	<upstream>
+	  	<remote-id type="cpe">cpe:/a:mongodb:c_driver</remote-id>
 		<remote-id type="github">mongodb/mongo-c-driver</remote-id>
 	</upstream>
 </pkgmetadata>