diff --git a/.SRCINFO b/.SRCINFO
index e4ccf19..bf23943 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
-pkgbase = pdfcpu-git
-	pkgdesc = A PDF processor written in Go.
-	pkgver = v0.6.0.r2.gb89d7b1
+pkgbase = pdfcpu
+	pkgdesc = A PDF processor written in Go
+	pkgver = 0.1.22
 	pkgrel = 1
 	url = https://github.com/hhrutter/pdfcpu
+	arch = i686
 	arch = x86_64
+	arch = armv7h
 	license = Apache
 	makedepends = go
-	provides = pdfcpu
-	conflicts = pdfcpu
-	source = pdfcpu::git+https://github.com/pdfcpu/pdfcpu.git
-	b2sums = SKIP
+	source = pdfcpu-0.1.22.tar.gz::https://github.com/hhrutter/pdfcpu/archive/v0.1.22.tar.gz
+	sha256sums = 452860b423d930d9c751cdcd765381370cdb87e55133a3495bd74bdd36ecb62d
+
+pkgname = pdfcpu
 
-pkgname = pdfcpu-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1c5fc98..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pkg.tar
-*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 83bc2f0..8939c47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,40 @@
-# Maintainer: Marco Rubin <marco.rubin@protonmail.com>
-# Contributor: Noel Kuntze <noel.kuntze at thermi dot consulting>
+# Maintainer: Noel Kuntze <noel.kuntze at thermi dot consulting>
 # Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
 # Contributor: Stephan Eisvogel <eisvogel at embinet dot de
 
-pkgname=pdfcpu-git
-_pkgname=pdfcpu
-provides=(pdfcpu)
-conflicts=(pdfcpu)
-pkgver=v0.6.0.r2.gb89d7b1
+pkgname=pdfcpu
+_gourl=github.com/hhrutter/pdfcpu
+pkgver=0.1.22
 pkgrel=1
-pkgdesc='A PDF processor written in Go.'
-arch=(x86_64)
-url='https://github.com/hhrutter/pdfcpu'
+pkgdesc="A PDF processor written in Go"
+arch=(i686 x86_64 armv7h)
+url="https://github.com/hhrutter/pdfcpu"
 license=('Apache')
 makedepends=(go)
-source=("$_pkgname"'::git+https://github.com/pdfcpu/pdfcpu.git')
-b2sums=(SKIP)
+
+source=(pdfcpu-$pkgver.tar.gz::https://$_gourl/archive/v$pkgver.tar.gz)
+
+sha256sums=('452860b423d930d9c751cdcd765381370cdb87e55133a3495bd74bdd36ecb62d')
+
+prepare() {
+    export GOPATH="${srcdir}/build"
+    mkdir -p "${GOPATH}/src/github.com/hhrutter/"
+    mv "${srcdir}/${pkgname}-${pkgver}" "${GOPATH}/src/$_gourl"
+    go get -v $_gourl/cmd/${pkgname}
+}
 
 build() {
-    cd $_pkgname
-    export CGO_CPPFLAGS="$CPPFLAGS"
-    export CGO_CFLAGS="$CFLAGS"
-    export CGO_CXXFLAGS="$CXXFLAGS"
-    export CGO_LDFLAGS="$LDFLAGS"
-    export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-    go build -buildvcs=false ./cmd/pdfcpu
+    export GOPATH="${srcdir}/build"
+    cd "${GOPATH}/src/$_gourl/cmd/${pkgname}"
+    go build -pkgdir "${pkgdir}"
 }
 
-pkgver() {
-    cd "$_pkgname"
-    git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-# check() {
-#     cd $_pkgname-$pkgver
-#     ./coverage.sh
-# }
-
 package() {
-    cd $_pkgname
-    install -Dm755 pdfcpu "$pkgdir/usr/bin/$_pkgname"
+    # copy binary
+    install -Dm0755 "${srcdir}/build/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+
+    # copy README.md and other documentation
+    install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" "${srcdir}/build/src/$_gourl/README.md"
+    # copy the license
+    install -Dm644  "${srcdir}/build/src/${_gourl}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }