diff --git a/systemtap/.SRCINFO b/systemtap/.SRCINFO
new file mode 100644
index 0000000..5a1318a
--- /dev/null
+++ b/systemtap/.SRCINFO
@@ -0,0 +1,26 @@
+pkgbase = systemtap
+	pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system
+	pkgver = 4.8
+	pkgrel = 1
+	url = http://sourceware.org/systemtap/
+	install = systemtap.install
+	arch = x86_64
+	arch = i686
+	license = GPL
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	makedepends = xmlto
+	depends = elfutils
+	depends = nss
+	depends = python
+	depends = cpio
+	optdepends = sqlite3: for storing results in a database
+	source = systemtap-4.8.tar.gz::https://sourceware.org/ftp/systemtap/releases/systemtap-4.8.tar.gz
+	source = systemtap-4.8.tar.gz.asc::https://sourceware.org/ftp/systemtap/releases/systemtap-4.8.tar.gz.sig
+	validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8
+	validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8
+	validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA
+	sha512sums = fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
+	sha512sums = SKIP
+
+pkgname = systemtap
diff --git a/systemtap/.gitignore b/systemtap/.gitignore
new file mode 100644
index 0000000..e93be39
--- /dev/null
+++ b/systemtap/.gitignore
@@ -0,0 +1,5 @@
+*.tar.xz
+*.tar.gz
+*.asc
+pkg
+src
diff --git a/systemtap/PKGBUILD b/systemtap/PKGBUILD
new file mode 100644
index 0000000..bfdbabb
--- /dev/null
+++ b/systemtap/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Christian Pellegrin (chripell) <chripell@fsfe.org>
+# Original Maintainer: An Nguyen (stk) <an@linux.com>
+# Original Maintainer: George Angelopoulos <george@usermod.net>
+# Original Maintainer: Christian Rebischke <Chris.Rebischke@archlinux.org>
+# Original Maintainer: dront78 <dront78@gmail.com>
+pkgname=systemtap
+pkgver=4.8
+pkgrel=1
+pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system"
+url="http://sourceware.org/systemtap/"
+arch=('x86_64' 'i686')
+license=('GPL')
+depends=('elfutils' 'nss' 'python' 'cpio')
+makedepends=('python-setuptools' 'python2-setuptools' 'xmlto')
+optdepends=('sqlite3: for storing results in a database')
+source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/ftp/systemtap/releases/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/ftp/systemtap/releases/${pkgname}-${pkgver}.tar.gz.sig"
+        )
+sha512sums=('fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2'
+            'SKIP')
+install='systemtap.install'
+# Note, you need to run:
+# gpg --recv-keys  --keyserver hkps://keys.openpgp.org/ 0xD7C256443CC637CA
+# unless /etc/pacman.d/gnupg/gpg.conf is updated.
+validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8'   # "Serhei Makarov (for Red Hat 2018..onwards) <smakarov@redhat.com>" 
+              '5D38116FA4D3A7CC77E378D37E83610126DCC2E8'
+	      '159B0DF71150B8A8539A8802D7C256443CC637CA')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+}
+
+build() {
+   cd "${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/"${pkgname}" \
+    --libdir=/usr/lib/"${pkgname}" \
+    --mandir=/usr/share/man/ \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --enable-pie \
+    --disable-docs \
+    --enable-htmldocs \
+    --with-python3
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rmdir "${pkgdir}/var/run/stap-server/"
+  rmdir "${pkgdir}/var/run/"
+  rm -r "${pkgdir}/usr/include"
+}
diff --git a/systemtap/systemtap.install b/systemtap/systemtap.install
new file mode 100644
index 0000000..bde565f
--- /dev/null
+++ b/systemtap/systemtap.install
@@ -0,0 +1,18 @@
+post_install() {
+  getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr
+  getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys
+  getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev
+
+  getent group stapusr >/dev/null && chgrp stapusr /usr/bin/stapbpf
+  chmod 04110 /usr/bin/stapbpf
+
+  getent group stapusr >/dev/null && chgrp stapusr /usr/bin/staprun
+  chmod 04110 /usr/bin/staprun
+
+  echo "CONFIG_DEBUG_INFO is disabled on default. You need to recompile"
+  echo "the kernel with CONFIG_DEBUG_INFO enabled."
+}
+
+post_upgrade() {
+  post_install $1
+}