diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index f3fee72..a487955 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -1,9 +1,10 @@
 # $Id$
 # Maintainer : Christian Rebischke <Chris.Rebischke@archlinux.org>
 # Contributor:dront78 <dront78@gmail.com>
+# Contributor:funbringer <ivadmi5@gmail.com>
 pkgname=systemtap
-pkgver=3.1
-pkgrel=5
+pkgver=3.2
+pkgrel=1
 pkgdesc="provides infrastructure to simplify the gathering of information about the running system."
 url="http://sourceware.org/systemtap/"
 arch=('x86_64')
@@ -12,21 +13,20 @@ depends=('elfutils' 'nss' 'python2')
 makedepends=('python2-setuptools' 'xmlto')
 optdepends=('sqlite3: for storing results in a database')
 source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc"
-        'access_process_vm_h.patch'
-        'stp_utrace_c.patch')
-sha512sums=('07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d'
+		"${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc"
+		"stp_remove_install_hooks.patch")
+sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94'
             'SKIP'
-            'f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b'
-            '09fad404170e0b5ba2e889d5081b668aba1802a01ac9c308735f872206180769f3784c2bde27a8b1bd666a410dfdfe05707fb64351008e8141746c85c76ecd92')
+            '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537')
 install='systemtap.install'
 validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/access_process_vm_h.patch"
-  patch -Np1 -i "${srcdir}/stp_utrace_c.patch"
+  patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch"
+  autoreconf -i
 }
+
 build() {
   cd "${pkgname}-${pkgver}"
   ./configure \
diff --git a/trunk/stp_remove_install_hooks.patch b/trunk/stp_remove_install_hooks.patch
new file mode 100644
index 0000000..244ac83
--- /dev/null
+++ b/trunk/stp_remove_install_hooks.patch
@@ -0,0 +1,37 @@
+diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am
+index a303d25f6..703668362 100644
+--- a/stapbpf/Makefile.am
++++ b/stapbpf/Makefile.am
+@@ -38,14 +38,4 @@ CLEANFILES =
+ BUILT_SOURCES += git_version.stamp
+ git_version.stamp ../git_version.h:
+ 	$(MAKE) -C .. $(notdir $@)
+-
+-# Why the "id -u" condition?  This way, an unprivileged user can run
+-# make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
+-install-exec-hook:
+-	if [ `id -u` -eq 0 ]; then \
+-		getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
+-		getent group stapusr >/dev/null \
+-		&& chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
+-		&& chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
+-	fi
+ endif
+diff --git a/staprun/Makefile.am b/staprun/Makefile.am
+index 4073aa01c..978d115f9 100644
+--- a/staprun/Makefile.am
++++ b/staprun/Makefile.am
+@@ -68,13 +68,3 @@ CLEANFILES =
+ BUILT_SOURCES += git_version.stamp
+ git_version.stamp ../git_version.h:
+ 	$(MAKE) -C .. $(notdir $@)
+-
+-
+-# Why the "id -u" condition?  This way, an unprivileged user can run
+-# make install, and have "sudo stap ...." or "sudo staprun ...." work later.
+-install-exec-hook:
+-	if [ `id -u` -eq 0 ]; then \
+-		getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
+-		getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
+-		chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
+-	fi
diff --git a/trunk/systemtap.install b/trunk/systemtap.install
index d168c58..fa99040 100644
--- a/trunk/systemtap.install
+++ b/trunk/systemtap.install
@@ -1,4 +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
+}