diff --git a/PKGBUILD b/PKGBUILD
index 97495a8..f9db080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ build() {
   cd "$GOROOT/src"
   hg update release.$pkgver
 
-  . ./make.bash 
+  ./make.bash
 }
 
 package() {
@@ -65,14 +65,7 @@ package() {
   mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
 
   cp -r bin $pkgdir/usr
-  cp -r doc misc -t $pkgdir/usr/share/go
-  cp -r pkg $pkgdir/usr/lib/go
-
-  install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
-
-  # Headers for C modules
-  install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
-  install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
+  cp -r doc lib misc src pkg -t $pkgdir/usr/lib/go
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
 }