diff --git a/dev-scheme/ypsilon/metadata.xml b/dev-scheme/ypsilon/metadata.xml
index 527ebea54e2e1..ca64a62109a42 100644
--- a/dev-scheme/ypsilon/metadata.xml
+++ b/dev-scheme/ypsilon/metadata.xml
@@ -5,9 +5,11 @@
 		<email>scheme@gentoo.org</email>
 		<name>Gentoo Scheme Project</name>
 	</maintainer>
-	<longdescription lang="en">Ypsilon is the implementation of Scheme Programming Language, which conforms
-		to the latest standard R6RS.</longdescription>
+	<longdescription lang="en">
+		Ypsilon is the implementation of Scheme Programming Language, which conforms
+		to the latest standard R6RS.
+	</longdescription>
 	<upstream>
-		<remote-id type="google-code">ypsilon</remote-id>
+		<remote-id type="github">fujita-y/ypsilon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
index 8c87df471929c..d23b6adb8f36a 100644
--- a/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
+++ b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
@@ -8,8 +8,8 @@ inherit flag-o-matic toolchain-funcs
 MY_P="${P/_p/.update}"
 
 DESCRIPTION="R6RS-compliant Scheme implementation for real-time applications"
-HOMEPAGE="https://code.google.com/p/ypsilon/"
-SRC_URI="https://ypsilon.googlecode.com/files/${MY_P}.tar.gz"
+HOMEPAGE="http://www.littlewingpinball.com/doc/en/ypsilon"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"