diff --git a/go-0.0.r57.1+hg20110521.tar.bz2 b/go-0.0.r57.1+hg20110521.tar.bz2
deleted file mode 100644
index c43a8ef..0000000
--- a/go-0.0.r57.1+hg20110521.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63dbf3d2d2f01f68045122f8778895810e6c18572e2450b025f296934f9a031c
-size 8619225
diff --git a/go-0.0.r57.1+hg20110608.tar.bz2 b/go-0.0.r57.1+hg20110608.tar.bz2
new file mode 100644
index 0000000..7b2a183
--- /dev/null
+++ b/go-0.0.r57.1+hg20110608.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8614ceedfdfc0ed48a069ec0ca345b0988561deb2966c35529fb308fc90211f4
+size 8604251
diff --git a/go.changes b/go.changes
index 7936bb9..0186b8e 100644
--- a/go.changes
+++ b/go.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun  8 07:59:53 UTC 2011 - saschpe@suse.de
+
+- Update to 08/05/2011 mercurial version
+  * ld: fix and simplify ELF symbol generation
+  * cgo: support non intel gcc machine flags
+  * gc: enable building under clang/2.9
+  * countless bugfixes, documentation and speed improvements
+- Don't build twice (thru all.bash and make.bash)
+
 -------------------------------------------------------------------
 Mon May 23 10:31:23 UTC 2011 - saschpe@suse.de
 
diff --git a/go.spec b/go.spec
index 6830894..c4e4326 100644
--- a/go.spec
+++ b/go.spec
@@ -11,7 +11,7 @@
 # published by the Open Source Initiative.
 
 Name:           go
-Version:        0.0.r57.1+hg20110521
+Version:        0.0.r57.1+hg20110608
 Release:        0
 Summary:        A compiled, garbage-collected, concurrent programming language
 Group:          Development/Languages/Other
@@ -87,7 +87,6 @@ cd src
 
 # compile and run full test suite (disable net tests)
 DISABLE_NET_TESTS=1 CFLAGS=$RPM_OPT_FLAGS LC_ALL=C PATH="$PATH:$GOBIN" ./all.bash
-CFLAGS=$RPM_OPT_FLAGS LC_ALL=C PATH="$PATH:$GOBIN" ./make.bash
 
 %install
 export GOROOT="%{buildroot}%{_libdir}/%{name}"
@@ -128,6 +127,7 @@ rm misc/swig/{callback/run,stdio/hello}
 rm doc/codelab/wiki/{htmlify.bin,srcextract.bin}
 rm misc/dashboard/builder/gobuilder
 rm misc/goplay/goplay
+rm -rf misc/cgo/test/{_*,*.o,*.out}
 # fix bnc#686557, contains image licensed under non-commercial license
 rm doc/talks/go_talk-20091030.pdf