diff --git a/.SRCINFO b/.SRCINFO
index 8ddfd4d..cb1003b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,15 +7,13 @@ pkgbase = systemtap
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = python2-setuptools
 	depends = elfutils
 	depends = nss
 	depends = python2
-	depends = texlive-fontsextra
-	depends = texlive-latexextra
-	depends = latex2html
 	optdepends = sqlite3
 	source = systemtap-3.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
-	sha512sums = 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
+	sha512sums = 10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d
 
 pkgname = systemtap
 
diff --git a/PKGBUILD b/PKGBUILD
index 752ed5a..bc32126 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 219416 2017-03-27 19:17:50Z shibumi $
 # Maintainer : Christian Rebischke <Chris.Rebischke@archlinux.org>
 # Contributor:dront78 <dront78@gmail.com>
 pkgname=systemtap
@@ -8,15 +8,24 @@ pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the g
 url="http://sourceware.org/systemtap/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('elfutils' 'nss' 'python2' 'texlive-fontsextra' 'texlive-latexextra' 'latex2html')
+depends=('elfutils' 'nss' 'python2')
+makedepends=('python2-setuptools')
 optdepends=('sqlite3')
 source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d')
+sha512sums=('10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d')
 install='systemtap.install'
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd "${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/"${pkgname}" \
+    --libdir=/usr/lib/"${pkgname}" \
+    --mandir=/usr/share/man/ \
+    --localstatedir=/var/run/"${pkgname}" \
+    --enable-pie \
+    --disable-docs
   make
 }