diff --git a/PKGBUILD b/PKGBUILD
index 97495a8..0073c1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ build() {
   cd "$GOROOT/src"
   hg update release.$pkgver
 
-  . ./make.bash 
+  ./make.bash
 }
 
 package() {
@@ -62,17 +62,13 @@ package() {
   install -Dm644 misc/emacs/go-mode.el $pkgdir/usr/share/emacs/site-lisp/go-mode.el
   install -Dm644 misc/vim/syntax/go.vim $pkgdir/usr/share/vim/vimfiles/syntax/go.vim
 
-  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+  mkdir -p $pkgdir/{etc/profile.d,usr/lib/go}
 
   cp -r bin $pkgdir/usr
-  cp -r doc misc -t $pkgdir/usr/share/go
-  cp -r pkg $pkgdir/usr/lib/go
+  cp -r doc lib misc src pkg -t $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
+  find "${pkgdir}/usr/lib/go/src" -name '*.o' -exec rm {} \;
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
 }
+# vim:set ts=2 sw=2 et: