diff --git a/.gitignore b/.gitignore
index b5c03c2..8214812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/84a4013f96e01fdd14b65d260a78b543e3702ee1.zip
-/90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+/937a34c9de13c766c814510f76bca091dee06028.tar.gz
diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec
index 933a1fd..eabe25b 100644
--- a/golang-googlecode-net.spec
+++ b/golang-googlecode-net.spec
@@ -5,7 +5,7 @@
 %global project         p
 %global repo            net
 %global import_path     %{provider_prefix}.%{provider}.%{provider_tld}/%{project}/go.%{repo}
-%global rev             90e232e2462dedc03bf3c93358da62d54d55dfb6
+%global rev             937a34c9de13c766c814510f76bca091dee06028
 %global shortrev        %(r=%{rev}; echo ${r:0:12})
 
 %global x_provider      golang
@@ -16,7 +16,7 @@
 
 Name:       golang-%{provider}%{provider_prefix}-%{repo}
 Version:    0
-Release:    0.17.hg%{shortrev}%{?dist}
+Release:    0.18.hg%{shortrev}%{?dist}
 Summary:    Supplementary Go networking libraries
 License:    BSD
 URL:        http://%{import_path}
@@ -105,12 +105,24 @@ for dir in */ ; do
    cp -rpav $dir %{buildroot}/%{gopath}/src/%{x_import_path}/
 done
 
+cd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \
+        $(find . -name '*.go')
+
 %check
-for dir in $(find . -mindepth 0 -maxdepth 3 -type d); do
-    if [ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' ]; then
-        GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/$dir
-    fi
-done
+# 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
 
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/testdata
 rm -rf %{buildroot}%{gopath}/src/%{import_path}/html/charset/testdata
@@ -126,6 +138,10 @@ rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/html/charset/testdata
 %{gopath}/src/%{x_import_path}
 
 %changelog
+* Tue Dec 09 2014 jchaloup <jchaloup@redhat.com> - 0-0.18.hg937a34c9de13
+- Update to the latest commit 937a34c9de13c766c814510f76bca091dee06028
+  related: #1009967
+
 * Mon Nov 24 2014 jchaloup <jchaloup@redhat.com> - 0-0.17.hg90e232e2462d
 - Extend import paths for golang.org/x/
   related: #1009967
diff --git a/sources b/sources
index 553600a..85de557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81b9462a7e6052c0f01772a3738dd49d  90e232e2462dedc03bf3c93358da62d54d55dfb6.tar.gz
+f2f3a1487d8fcbbefb5824d924d55305  937a34c9de13c766c814510f76bca091dee06028.tar.gz