diff --git a/.gitignore b/.gitignore
index 9d8af76..8068c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 st
 *.rej
 *.orig
+src/
+pkg/
+*.tar*
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..c27bbef
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,27 @@
+branches: master
+
+when:
+  event: push
+
+pipeline:
+  build:
+    image: 'archlinux:latest'
+    commands:
+      # Update packages
+      - pacman -Syu --needed --noconfirm base-devel
+      # Create non-root user to perform build & switch to their home
+      - groupadd -g 1000 builder
+      - useradd -mg builder builder
+      - chown -R builder:builder "$PWD"
+      - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - su builder
+      # Build the package
+      - MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed
+
+  publish:
+    image: 'archlinux:latest'
+    commands:
+      # Publish the package
+      - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish'
+    secrets:
+      - api_key
diff --git a/FAQ b/FAQ
index 0f9609d..969b195 100644
--- a/FAQ
+++ b/FAQ
@@ -29,8 +29,8 @@ you can manually run `tic -sx st.info`.
 
 ## I would like to have utmp and/or scroll functionality by default
 
-You can add the absolute patch of both programs in your config.h
-file. You only have to modify the value of utmp and scroll variables.
+You can add the absolute path of both programs in your config.h file. You only
+have to modify the value of utmp and scroll variables.
 
 
 ## Why doesn't the Del key work in some programs?
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 0000000..f18944c
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Jef Roosens
+
+pkgname=jjr-st
+pkgver=0.8.5
+pkgrel=1
+pkgdesc="My build of the st terminal"
+arch=("x86_64")
+
+url="https://git.rustybever.be/Chewing_Bever/st"
+license=("MIT")
+
+depends=("libxft")
+makedepends=("clang")
+provides=("st")
+conflicts=("st" "st-git")
+
+source=("arg.h" "boxdraw.c" "boxdraw.o" "boxdraw_data.h" "config.def.h" "config.h" "config.mk" "hb.c" "hb.h" "hb.o" "LICENSE" "Makefile" "st.1" "st.c" "st.h" "st.info" "win.h" "x.c" "x.o" "README")
+md5sums=('7a0155e070d14041f69ca4466aad18bf'
+         '67a7923385b308ab714a66a81e2803f5'
+         '977a6000f83c90e69b2dde8288128dcf'
+         '54322cef62604ce8c288b3d2d20f1baa'
+         'ce86c3890ce6cc520f7d895c44089a7e'
+         '34a60a679fdc80ab649982ca014b8883'
+         'db3ef406027a4e75e6ddb50b986caa52'
+         'f6fcbd03c6f1013e4f592278bf96086d'
+         '704b67624d026f76577ce51d021ef00a'
+         'b581e688384ca1f3d93c18e6933e3f9d'
+         '04c3ca13a702147c62db90f556c5b3ca'
+         '84025d924d1ddf176f8dc028bc5f6453'
+         'bafec1da6c9f80fffd25dd5a85004b42'
+         'ef77a180cc99be9226e8296e5ae3ada5'
+         '4f1e1612b1e43442b34bb0fb44254af0'
+         '0cbfe790d927cce15ae8e658de03f8aa'
+         'ab9cbb2f172fd88c3c0d8a87eb7bd666'
+         '63ed863d96f9571cbdb50664b3e70001'
+         '661a69b61e9da7b94bb0e4abd22fe365'
+         'd344c31a3b60c2a3ba1c84b914dd2509')
+
+build() {
+    make
+}
+
+package() {
+  local installopts='--mode 0644 -D --target-directory'
+  local shrdir="$pkgdir/usr/share"
+  local licdir="$shrdir/licenses/$pkgname"
+  local docdir="$shrdir/doc/$pkgname"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  install $installopts "$licdir" "LICENSE"
+  install $installopts "$docdir" "README"
+  # install $installopts "$docdir" README.terminfo.rst
+  # install $installopts "$shrdir/$pkgname" "$_sourcedir/st.info"
+}
diff --git a/config.mk b/config.mk
index 8adb05d..b194785 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.8.4
+VERSION = 0.8.5
 
 # Customize below to fit your system
 
@@ -34,4 +34,4 @@ STLDFLAGS = $(LIBS) $(LDFLAGS)
 #       `$(PKG_CONFIG) --libs freetype2`
 
 # compiler and linker
-# CC = c99
+CC = clang