diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index 9d10a0c44bad1..9e50e18ed484c 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -8,7 +8,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="google-code">serf</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index a6127b0a68edf..7b8cc976c7c35 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,8 +7,8 @@ EAPI="5"
 inherit eutils scons-utils toolchain-funcs flag-o-matic
 
 DESCRIPTION="HTTP client library"
-HOMEPAGE="https://code.google.com/p/serf/"
-SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index f244b51a97686..dbaa9021abd97 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,8 +7,8 @@ EAPI="5"
 inherit eutils scons-utils toolchain-funcs
 
 DESCRIPTION="HTTP client library"
-HOMEPAGE="https://code.google.com/p/serf/"
-SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
+HOMEPAGE="https://serf.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"