diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index b42ab3611d47a..1183b4f3ae971 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+	</maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.
@@ -14,8 +17,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">firebird</remote-id>
+		<remote-id type="github">FirebirdSQL/firebird</remote-id>
 	</upstream>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>