diff --git a/.SRCINFO b/.SRCINFO
index d2bd346..c8e63fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Wed Oct 26 08:45:07 UTC 2016
 pkgbase = st-git
 	pkgdesc = Simple virtual terminal emulator for X
-	pkgver = 0.7.9.g8c99915
+	pkgver = 0.8.2.r20.g8386642
 	pkgrel = 1
-	epoch = 1
-	url = http://st.suckless.org/
+	url = https://st.suckless.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
@@ -15,7 +12,6 @@ pkgbase = st-git
 	depends = libxft
 	provides = st
 	conflicts = st
-	options = zipman
 	source = git://git.suckless.org/st
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
old mode 100644
new mode 100755
index 7d9b4df..7dc15bf
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,48 @@
-# Maintainer: mar77i <mar77i at mar77i dot ch>
-# Past Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Tarmo Heiskanen <turskii@gmail.com>
+# Contributor: mar77i <mar77i at mar77i dot ch>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Scytrin dai Kinthra <scytrin@gmail.com>
 
 pkgname=st-git
-_pkgname=st
-pkgver=0.7.9.g8c99915
+pkgver=0.8.2.r20.g8386642
 pkgrel=1
 pkgdesc='Simple virtual terminal emulator for X'
-url='http://st.suckless.org/'
+url='https://st.suckless.org/'
 arch=('i686' 'x86_64')
 license=('MIT')
-options=('zipman')
 depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
-epoch=1
-# include config.h and any patches you want to have applied here
 source=('git://git.suckless.org/st')
 sha1sums=('SKIP')
+provides=("st")
+conflicts=("st")
 
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
 
 pkgver() {
-	cd "${_pkgname}"
-	git describe --tags |sed 's/-/./g'
+    cd "${srcdir}/st"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	local file
-	cd "${_pkgname}"
-	sed \
-		-e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \
-		-e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \
-		-e '/int defaultcs/s/= .*/= 1;/' \
-		-i config.def.h
-	sed \
-		-e 's/CPPFLAGS =/CPPFLAGS +=/g' \
-		-e 's/CFLAGS =/CFLAGS +=/g' \
-		-e 's/LDFLAGS =/LDFLAGS +=/g' \
-		-e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \
-		-i config.mk
-	sed '/@tic/d' -i Makefile
-	for file in "${source[@]}"; do
-		if [[ "$file" == "config.h" ]]; then
-			# add config.h if present in source array
-			# Note: this supersedes the above sed to config.def.h
-			cp "$srcdir/$file" .
-		elif [[ "$file" == *.diff || "$file" == *.patch ]]; then
-			# add all patches present in source array
-			patch -Np1 <"$srcdir/$(basename ${file})"
-		fi
-	done
+    cd "${srcdir}/st"
+
+    echo 'Copying config.def.h to $startdir...'
+    cp config.def.h "${startdir}/"
+
+    echo 'Copying config.h from $startdir if it exists...'
+    [ -f "${startdir}/config.h" ] && cp "${startdir}/config.h" . || true
 }
 
 build() {
-	cd "${_pkgname}"
-	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+    cd "${srcdir}/st"
+
+    make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 
 package() {
-	cd "${_pkgname}"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
+    cd "${srcdir}/st"
+
+    make PREFIX=/usr DESTDIR="${pkgdir}" TERMINFO="/dev/null" install
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
 }