diff --git a/dev-ruby/serverengine/metadata.xml b/dev-ruby/serverengine/metadata.xml
index 658c72b1920d8..e922d46606d09 100644
--- a/dev-ruby/serverengine/metadata.xml
+++ b/dev-ruby/serverengine/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">treasure-data/serverengine</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/serverengine/serverengine-2.3.2.ebuild b/dev-ruby/serverengine/serverengine-2.3.2.ebuild
index 60ea9e70f773f..1555dfadaa3e5 100644
--- a/dev-ruby/serverengine/serverengine-2.3.2.ebuild
+++ b/dev-ruby/serverengine/serverengine-2.3.2.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
+HOMEPAGE="https://github.com/treasure-data/serverengine"
 LICENSE="Apache-2.0"
 
 KEYWORDS="~amd64"