diff --git a/app-emacs/matlab/metadata.xml b/app-emacs/matlab/metadata.xml
index 20009f1557f5b..55f5587e20647 100644
--- a/app-emacs/matlab/metadata.xml
+++ b/app-emacs/matlab/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
-<upstream>
-  <remote-id type="sourceforge">matlab-emacs</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <bugs-to>https://github.com/mathworks/Emacs-MATLAB-Mode/issues/</bugs-to>
+    <remote-id type="github">mathworks/Emacs-MATLAB-Mode</remote-id>
+  </upstream>
 </pkgmetadata>