diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
deleted file mode 100644
index dcd4ab32263..00000000000
--- a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
-Date: Sun, 16 Jun 2019 08:07:32 +0200
-Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
-
-- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
-  is not defined
-- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
----
- src/rrd_graph.c   | 2 +-
- src/rrd_rpncalc.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index f5d2cdec5..62c3e645f 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -1568,7 +1568,7 @@ static int find_first_weekday(
-         }
-         first_weekday = (week_1stday + first_weekday - 1) % 7;
- #else
--        first_weekday = 1;
-+        first_weekday = 0;
- #endif
-     }
-     return first_weekday;
-diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
-index 0f54c6be6..84f692119 100644
---- a/src/rrd_rpncalc.c
-+++ b/src/rrd_rpncalc.c
-@@ -564,7 +564,7 @@ static int find_first_weekday(void){
-         }
-         first_weekday=(week_1stday + first_weekday - 1) % 7;
- #else
--        first_weekday = 1;
-+        first_weekday = 0;
- #endif
-     }
-     return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index f8edb752f26..f816b96eeab 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,32 +1,28 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
-version=1.7.2
-revision=16
+version=1.8.0
+revision=1
 build_style=gnu-configure
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="--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
- am_cv_python_version=${py3_ver}"
-hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
+ --enable-lua-site-install --enable-tcl --disable-libwrap"
+hostmakedepends="automake gettext-devel-tools groff intltool libtool
+ perl-XML-Parser pkg-config python3-setuptools which"
 makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
 depends="dejavu-fonts-ttf"
-checkdepends="bc"
+checkdepends="bc ${depends}"
 short_desc="Data logging and graphing system for time series data"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://oss.oetiker.ch/rrdtool"
 distfiles="https://github.com/oetiker/rrdtool-1.x/releases/download/v${version}/rrdtool-${version}.tar.gz"
-checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
+checksum=bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4
 python_version=3
 nocross=yes
 
-python-rrdtool_package() {
-	short_desc+=" - Python 3 bindings (old misnamed package)"
-	depends=python3-rrdtool
-	build_style=meta
+pre_configure() {
+	autoreconf -fi
 }
 
 python3-rrdtool_package() {