diff --git a/.SRCINFO b/.SRCINFO
index 0176fb2..0da61e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,16 @@
 pkgbase = gotosocial
 	pkgdesc = ActivityPub social network server written in Golang
+<<<<<<< HEAD
 	pkgver = 0.14.2
+||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1)
+	pkgver = 0.12.2
+=======
+	pkgver = 0.15.0
+>>>>>>> 6bb58b8 (upgpkg: 0.15.0-1)
 	pkgrel = 1
 	url = https://gotosocial.org
 	arch = x86_64
-	license = AGPL3
+	license = AGPL-3.0-only
 	makedepends = git
 	makedepends = go
 	makedepends = yarn
@@ -35,15 +41,21 @@ pkgbase = gotosocial
 	backup = etc/gotosocial/template/status.tmpl
 	backup = etc/gotosocial/template/tag.tmpl
 	backup = etc/gotosocial/template/thread.tmpl
+<<<<<<< HEAD
 	source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=0bd95d7b71ae71d801b0fbb643598eb0ccd1b8f5
+||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1)
+	source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=096c517cc332ce2832a8c5dfbd1cd827ab7d0ecb
+=======
+	source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.15.0
+>>>>>>> 6bb58b8 (upgpkg: 0.15.0-1)
 	source = sysusers.conf
 	source = tmpfiles.conf
 	source = use-fhs-directories.patch
-	sha512sums = SKIP
+	sha512sums = 029ad577224c40459b834471d1c11346469105dc8995cfc4749f13c512351fbd866bfdcc7049d967681bbe23aad37e248c89dc67ff4e35cff9dc8a441a3271fd
 	sha512sums = 68890539a1285a819d5a2cd755aeabd59a9872926d9c32e5d54faaf2771414f006e568f2f813f3c6fcd9dbeda7b6e57c924d7490521880cb65632e02fabcbd63
 	sha512sums = b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a
 	sha512sums = 913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77
-	b2sums = SKIP
+	b2sums = cadf03d2cc35b145c94899d97e1da04962f91034a524be277236c786c31617a6263f75b24e4547175c13fe28f783a7b55eab05c6afc659c4cbedb9a7066d6d9e
 	b2sums = 0a5be7ac18af882c0c89d8e930eb76c2e60bc2c1d5a375ab04e987c7de9a7a3175319c4e5fbc818261141daf5f70d583aebcc2dc197fe3a88047fbfe488ccb94
 	b2sums = 4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04
 	b2sums = 9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c
diff --git a/PKGBUILD b/PKGBUILD
index 7d0d648..f3e3066 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=gotosocial
-pkgver=0.14.2
+pkgver=0.15.0
 pkgrel=1
 pkgdesc='ActivityPub social network server written in Golang'
 arch=('x86_64')
 url='https://gotosocial.org'
-license=('AGPL3')
+license=('AGPL-3.0-only')
 depends=('glibc')
 makedepends=('git' 'go' 'yarn' 'nodejs' 'go-swagger')
 options=('!lto')
@@ -37,18 +37,17 @@ backup=(
   'etc/gotosocial/template/tag.tmpl'
   'etc/gotosocial/template/thread.tmpl'
 )
-_commit='0bd95d7b71ae71d801b0fbb643598eb0ccd1b8f5'
 source=(
-  "$pkgname::git+https://github.com/superseriousbusiness/gotosocial#commit=$_commit"
+  "$pkgname::git+https://github.com/superseriousbusiness/gotosocial#tag=v$pkgver"
   'sysusers.conf'
   'tmpfiles.conf'
   'use-fhs-directories.patch'
 )
-sha512sums=('SKIP'
+sha512sums=('029ad577224c40459b834471d1c11346469105dc8995cfc4749f13c512351fbd866bfdcc7049d967681bbe23aad37e248c89dc67ff4e35cff9dc8a441a3271fd'
             '68890539a1285a819d5a2cd755aeabd59a9872926d9c32e5d54faaf2771414f006e568f2f813f3c6fcd9dbeda7b6e57c924d7490521880cb65632e02fabcbd63'
             'b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a'
             '913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77')
-b2sums=('SKIP'
+b2sums=('cadf03d2cc35b145c94899d97e1da04962f91034a524be277236c786c31617a6263f75b24e4547175c13fe28f783a7b55eab05c6afc659c4cbedb9a7066d6d9e'
         '0a5be7ac18af882c0c89d8e930eb76c2e60bc2c1d5a375ab04e987c7de9a7a3175319c4e5fbc818261141daf5f70d583aebcc2dc197fe3a88047fbfe488ccb94'
         '4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04'
         '9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c')
@@ -92,7 +91,7 @@ build() {
     -modcacherw \
     -ldflags "-compressdwarf=false \
     -linkmode external \
-    -extldflags \"${LDFLAGS}\" \
+    -extldflags '${LDFLAGS}' \
     -X main.Version=$pkgver" \
     -o build \
     ./cmd/...