diff --git a/media-libs/libebur128/metadata.xml b/media-libs/libebur128/metadata.xml
index 22387e5f3ee12..c586b3264aa7e 100644
--- a/media-libs/libebur128/metadata.xml
+++ b/media-libs/libebur128/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>amynka@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 </longdescription>
+	<upstream>
+		<remote-id type="github">jiixyj/libebur128</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index a551a235c3b77..8db4d281e97c8 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -24,5 +24,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">mlt</remote-id>
+    <remote-id type="github">mltframework/mlt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 97bdf9dd12a9b..29819de17989c 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<maintainer>
-	<email>dilfridge@gentoo.org</email>
-	<name>Andreas K. Huettel</name>
-</maintainer>
-<maintainer>
-	<email>amynka@gentoo.org</email>
-	<name>Amy Winston</name>
-</maintainer>
-<longdescription>
+	<herd>kde</herd>
+	<maintainer>
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
+	</maintainer>
+	<maintainer>
+		<email>amynka@gentoo.org</email>
+		<name>Amy Winston</name>
+	</maintainer>
+	<longdescription>
 OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
 Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
 Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
 </longdescription>
-<use>
-	<flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
-	<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
-	<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
-	<flag name="ipp">Enable Intel Integrated Primitive support</flag>
-	<flag name="opencl">Add support for OpenCL</flag>
-	<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
-	<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
-</use>
+	<use>
+		<flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
+		<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+		<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
+		<flag name="opencl">Add support for OpenCL</flag>
+		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
+		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">opencvlibrary</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 42090b9cf9258..60405e4494c4e 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>base-system</herd>
 	<upstream>
 		<remote-id type="sourceforge">cracklib</remote-id>
+		<remote-id type="github">cracklib/cracklib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
index 42090b9cf9258..60405e4494c4e 100644
--- a/sys-libs/cracklib/metadata.xml
+++ b/sys-libs/cracklib/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>base-system</herd>
 	<upstream>
 		<remote-id type="sourceforge">cracklib</remote-id>
+		<remote-id type="github">cracklib/cracklib</remote-id>
 	</upstream>
 </pkgmetadata>