diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 60772ae3b38..1ff7e41dd1b 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,7 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=r58
-revision=2
+version="$(date -u +%Y%m%d)"
 short_desc="The Go Programming Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://golang.org/"
@@ -30,8 +29,8 @@ Add_dependency build gawk
 Add_dependency build glibc-devel
 
 do_fetch() {
-	local url="https://go.googlecode.com/hg"
-	hg clone -u ${version} ${url} ${pkgname}-${version}
+	local url="https://code.google.com/p/go"
+	hg clone ${url} ${pkgname}-${version}
 }
 
 do_build() {