diff --git a/rrdtool/PKGBUILD b/rrdtool/PKGBUILD
index ce2ab3ecd..25ea4feb1 100644
--- a/rrdtool/PKGBUILD
+++ b/rrdtool/PKGBUILD
@@ -1,26 +1,25 @@
 # Contributors from Arch: Eric Belanger <eric@archlinux.org>
-#                         Tom K <tom@archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.6.0
-pkgrel=3
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 arch=('x86_64')
-url="http://www.rrdtool.org"
-license=('GPL')
-depends=('libpng' 'libxml2' 'pango')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff')
+url="https://oss.oetiker.ch/rrdtool/"
+license=('GPL' 'custom')
+depends=('libpng' 'libxml2' 'pango' 'ttf-dejavu')
+makedepends=('intltool' 'ruby' 'python2' 'python2-setuptools' 'tcl' 'lua51' 'groff')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!makeflags')
-source=("http://oss.oetiker.ch/rrdtool/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('9866b41bda9416188f236d61d24f185b173fd571')
+            'lua51: to use corresponding binding')
+options=('!emptydirs' '!makeflags')
+source=("https://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  # fix Arch's FS#28521 make ruby install to vendor_ruby instead of site_ruby
   sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am
   aclocal
   automake
@@ -28,11 +27,12 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+    LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+    ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install \
-    --enable-tcl --disable-libwrap
+    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
   make LIBS+="-lglib-2.0"
 }