diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py
index 5fd1e49d92..1702a50f1a 100644
--- a/programming/language/go/actions.py
+++ b/programming/language/go/actions.py
@@ -9,25 +9,19 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
-shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR())
-shelltools.export("GOBIN", "$GOROOT/bin")
-shelltools.export("GOPATH", "%s" % get.workDIR())
-shelltools.export("GOROOT_FINAL", "/usr/lib/go")
-shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR())
-
-shelltools.export("GOHOSTARCH","amd64")
-shelltools.export("GOHOSTOS","linux")
-shelltools.export("CC", "gcc")
-
-shelltools.export("GOOS","linux")
-shelltools.export("GOARCH","amd64")
-
-shelltools.export("CC_FOR_TARGET", "gcc")
-shelltools.export("CXX_FOR_TARGET", "g++")
-
 NoStrip=["/"]
 
 def build():
+    
+    shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #0
+    shelltools.export("GOBIN", "$GOROOT/bin") #1
+    shelltools.export("GOPATH", "%s" % get.workDIR())
+    #shelltools.export("GOROOT_FINAL", "/usr/lib/go")
+    shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR())  #2
+
+    shelltools.export("GOOS","linux")
+    shelltools.export("GOARCH","amd64")
+    
     shelltools.cd("src")
 
     shelltools.system("./make.bash")
@@ -46,20 +40,20 @@ def install():
     shelltools.cd("%s/go-go1.6.2" % get.workDIR())
 
     pisitools.dodir("/usr/lib/go")
-    pisitools.insinto("/usr/lib/go", "bin")
-    
+    shelltools.system("cp -rp api bin doc lib pkg src  %s/usr/lib/go" % get.installDIR())
+        
     pisitools.dosym("/usr/lib/go/bin/go", "/usr/bin/go")
     pisitools.dosym("/usr/lib/go/bin/gofmt", "/usr/bin/gofmt")
     
-    pisitools.insinto("/usr/lib/go", "doc")
-    pisitools.insinto("/usr/lib/go", "lib")
-    pisitools.insinto("/usr/lib/go", "pkg")
-    pisitools.insinto("/usr/lib/go", "src")
+    shelltools.system("cp -R doc  %s/usr/lib/go" % get.installDIR())
+    shelltools.system("cp -R lib  %s/usr/lib/go" % get.installDIR())
+    shelltools.system("cp -R pkg  %s/usr/lib/go" % get.installDIR())
+    shelltools.system("cp -R src  %s/usr/lib/go" % get.installDIR())
+    
+#    shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755)
+#    shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755)
 
-    shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755)
-    shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755)
-
-    pisitools.insinto("/usr/lib/go", "misc")
+    shelltools.system("cp -a misc  %s/usr/lib/go" % get.installDIR())
     
     pisitools.removeDir("/usr/lib/go/pkg/bootstrap")
  
diff --git a/programming/language/go/pspec.xml b/programming/language/go/pspec.xml
index 7784b9c369..217d0a187c 100644
--- a/programming/language/go/pspec.xml
+++ b/programming/language/go/pspec.xml
@@ -14,14 +14,12 @@
         <Description>Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.</Description>
         <Archive sha1sum="1c7b23001917ba2fdc51d2e35079a851c99ab437" type="targz">https://github.com/golang/go/archive/go1.6.2.tar.gz</Archive>
         <Archive sha1sum="97058ade5ad63119f78aa5d1717b1ac26c9f5f7b" type="tarbz2" target="go-go1.6.2">https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz</Archive>
-        <BuildDependencies>
+        <!--BuildDependencies>
             <Dependency>perl</Dependency>
             <Dependency>gawk</Dependency>
             <Dependency>mercurial</Dependency>
             <Dependency>git</Dependency>
-        </BuildDependencies>
-        <Patches>
-        </Patches>
+        </BuildDependencies-->
     </Source>
     <Package>
         <Name>golang</Name>
@@ -31,12 +29,8 @@
         <Files>
             <Path fileType="executable">/usr/bin/</Path>
             <Path fileType="library">/usr/lib/</Path>
-            <Path fileType="config">/etc</Path>
             <Path fileType="data">/usr/share/</Path>
         </Files>
-        <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/profile.d/go.sh">go.sh</AdditionalFile>
-        </AdditionalFiles>
     </Package>
 
     <History>