diff --git a/.SRCINFO b/.SRCINFO
index 3077738..8d1db6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = karn
 	pkgdesc = Manage multiple Git identities with ease
 	pkgver = 0.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/prydonius/karn
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 4f8932e..062eae6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,35 @@
 
 pkgname=karn
 pkgver=0.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Manage multiple Git identities with ease"
 arch=('x86_64' 'i686')
 url="https://github.com/prydonius/karn"
 license=('MIT')
 makedepends=('go')
 options=('!strip' '!emptydirs')
+
 source=("https://github.com/prydonius/karn/archive/v$pkgver.tar.gz")
 sha256sums=('68d244558ef62cf1da2b87927a0a2fbf907247cdd770fc8c84bf72057195a6cb')
 
-prepare() {
-  GOPATH=`pwd`
-  cd "$pkgname-$pkgver"
-  go get github.com/urfave/cli
-}
-
 build() {
-  GOPATH=`pwd`
-  cd "$pkgname-$pkgver"
-  go build cmd/karn/karn.go
+	cd "$srcdir/$pkgname-$pkgver"
+
+	rm -rf "$srcdir/go/src"
+
+	mkdir -p "$srcdir/go/src"
+
+	export GOPATH="$srcdir/go"
+
+	mv "$srcdir/$pkgname-$pkgver" "$srcdir/go/src/$pkgname"
+
+	cd "$srcdir/go/src/$pkgname/"
+
+	go get
+
+	go build cmd/karn/karn.go
 }
 
 package() {
-  ls -la
-  install -Dm755 "$pkgname-$pkgver/karn" "$pkgdir/usr/bin/$pkgname"
-}
\ No newline at end of file
+	install -DT "$srcdir/go/src/$pkgname/$pkgname" "$pkgdir/usr/bin/karn"
+}