diff --git a/.gitignore b/.gitignore
index 8214812..1baa2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/937a34c9de13c766c814510f76bca091dee06028.tar.gz
+/net-71586c3.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 6fd557a..d9ee035 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -1,12 +1,11 @@
 %global debug_package   %{nil}
 %global provider_tld    com
-%global provider        google
-%global provider_prefix code
-%global project         p
+%global provider        github
+%global project         golang
 %global repo            net
-%global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             937a34c9de13c766c814510f76bca091dee06028
-%global shortrev        %(r=%{rev}; echo ${r:0:12})
+%global import_path     code.google.com/p/go.net
+%global commit          71586c3cf98f806af322c5a361660eb046e00501
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global x_provider      golang
 %global x_provider_tld  org
@@ -14,14 +13,18 @@
 %global x_import_path   %{x_provider}.%{x_provider_tld}/x/%{x_repo}
 %global x_name          golang-%{x_provider}%{x_provider_tld}-%{repo}
 
-Name:       golang-%{provider}%{provider_prefix}-%{repo}
+Name:       golang-googlecode-net
 Version:    0
-Release:    0.19.hg%{shortrev}%{?dist}
+Release:    0.20.git%{shortcommit}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
-Source0:    https://%{repo}.go.%{provider}%{provider_prefix}.%{provider_tld}/archive/%{rev}.tar.gz
-BuildArch:  noarch
+Source0:    https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch:      noarch
+%else
+ExclusiveArch:  %{ix86} x86_64 %{arm}
+%endif
 
 %description
 %{summary}
@@ -93,7 +96,7 @@ which use the supplementary Go text libraries with golang.org/x/ imports.
 
 %prep
 
-%setup -qn net.go-%{shortrev}
+%setup -q -n %{repo}-%{commit}
 
 %build
 
@@ -111,18 +114,18 @@ sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
 
 %check
 # context, icmp failing
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/spdy
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/webdav
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv4
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html
-#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/charset
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/html/atom
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/idna
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/netutil
-#GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/ipv6
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/websocket
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/publicsuffix
-GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/proxy
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/spdy
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/webdav
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv4
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/charset
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/html/atom
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/idna
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/netutil
+#GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/ipv6
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/websocket
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/publicsuffix
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/proxy
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -138,6 +141,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Fri Feb 06 2015 jchaloup <jchaloup@redhat.com> - 0-0.20.git71586c3
+- Bump to upstream 71586c3cf98f806af322c5a361660eb046e00501
+- Repo moved to github, changing spec file header and globals
+
 * Thu Dec 18 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.19.hg937a34c9de13
 - Resolves: rhbz#1056185 disable ipv6 test
 - also disable html/charset test
diff --git a/sources b/sources
index 60aa9a3..dd0a03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3d38ac958e851624c5d86ad283c35b9  937a34c9de13c766c814510f76bca091dee06028.tar.gz
+ccc4eb5631b6e21a018691229f665838  net-71586c3.tar.gz