diff --git a/.SRCINFO b/.SRCINFO
index c4965f3..2738477 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = yay
-	pkgdesc = Yet another yogurt. Pacman wrapper with AUR support written in go.
-	pkgver = 1.92
+	pkgdesc = Yet another yogurt. Pacman wrapper and AUR helper written in go.
+	pkgver = 1.95
 	pkgrel = 1
 	url = https://github.com/Jguer/yay
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index e1e2298..15503b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jguer <joaogg3@gmail.com>
 pkgname=yay
-pkgver=1.92
+pkgver=1.95
 pkgrel=1
-pkgdesc="Yet another yogurt. Pacman wrapper with AUR support written in go."
+pkgdesc="Yet another yogurt. Pacman wrapper and AUR helper written in go."
 arch=('i686' 'x86_64' 'arm')
 url="https://github.com/Jguer/yay"
 license=('GPL')
@@ -14,18 +14,8 @@ makedepends=(
 	'git'
 )
 conflicts=('yay-bin')
-
-
-source=(
-	"yay::git://github.com/jguer/yay.git#branch=${BRANCH:-master}"
-)
-
-md5sums=(
-	'SKIP'
-)
-
-backup=(
-)
+source=("yay::git://github.com/jguer/yay.git#branch=${BRANCH:-master}")
+md5sums=('SKIP')
 
 pkgver() {
 	if [[ "$PKGVER" ]]; then
@@ -43,23 +33,24 @@ build() {
 
 	if [ -L "$srcdir/$pkgname" ]; then
 		rm "$srcdir/$pkgname" -rf
-		mv "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
+		cp -r "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname"
 	fi
 
 	rm -rf "$srcdir/.go/src"
 
-	mkdir -p "$srcdir/.go/src"
+	mkdir -p "$srcdir/.go/src/github.com/jguer"
 
 	export GOPATH="$srcdir/.go"
 
-	mv "$srcdir/$pkgname" "$srcdir/.go/src/"
+	cp -r "$srcdir/$pkgname" "$srcdir/.go/src/github.com/jguer/"
 
-	cd "$srcdir/.go/src/$pkgname/cmd/yay"
-	ln -sf "$srcdir/.go/src/$pkgname/cmd/yay" "$srcdir/$pkgname"
+	cd "$srcdir/.go/src/github.com/jguer/$pkgname/cmd/yay"
+	ln -sf "$srcdir/.go/src/github.com/jguer/$pkgname/cmd/yay" "$srcdir/$pkgname"
 
 	git submodule update --init
 
-	go get -v \
+  go get github.com/jguer/go-alpm
+  go install -v \
 		-gcflags "-trimpath $GOPATH/src" \
 		-ldflags="-X main.version=$pkgver"
 }
@@ -70,23 +61,21 @@ package() {
 		install -DT "$filename" "$pkgdir/usr/bin/$(basename $filename)"
 	done
 
-	cd "$srcdir/.go/src/$pkgname"
+	cd "$srcdir/.go/src/github.com/jguer/$pkgname"
 
   # Install GLP v3
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
+  # Install manpage
+  install -Dm644 yay.8 "${pkgdir}/usr/share/man/man8/yay.8"
 
   # Install zsh completion
-  mkdir -p "${pkgdir}/usr/share/zsh/site-functions"
-  install -m644 "zsh-completion" "${pkgdir}/usr/share/zsh/site-functions/_yay"
+  install -Dm644 "zsh-completion" "${pkgdir}/usr/share/zsh/site-functions/_yay"
 
   # Install fish completion
-  mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d"
-  install -m644 "yay.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/yay.fish"
+  install -Dm644 "yay.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/yay.fish"
 
   # Install bash completion
-  mkdir -p "${pkgdir}/usr/share/bash-completion/completions/"
   install -Dm644 "bash-completion" "${pkgdir}/usr/share/bash-completion/completions/yay"
 
 }