diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index 0cbcb25fe8a..cf8ce771084 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -2,14 +2,14 @@
 pkgname=python-dateutil
 version=2.8.2
 revision=2
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-six tzdata"
 short_desc="Extensions to the standard Python2 datetime module"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
 checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
 
 post_patch() {
@@ -19,12 +19,3 @@ post_patch() {
 post_install() {
 	vlicense LICENSE
 }
-
-python3-dateutil_package() {
-	depends="python3-six tzdata"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-dateutil b/srcpkgs/python3-dateutil
deleted file mode 120000
index 4ea05edb098..00000000000
--- a/srcpkgs/python3-dateutil
+++ /dev/null
@@ -1 +0,0 @@
-python-dateutil
\ No newline at end of file
diff --git a/srcpkgs/python3-dateutil/patches/pytest8.patch b/srcpkgs/python3-dateutil/patches/pytest8.patch
new file mode 100644
index 00000000000..7372d568fd3
--- /dev/null
+++ b/srcpkgs/python3-dateutil/patches/pytest8.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ tests/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_internals.py b/tests/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/dateutil/test/test_internals.py
++++ b/dateutil/test/test_internals.py
+@@ -9,6 +9,7 @@ code that may be difficult to reach through the standard API calls.
+ 
+ import sys
+ import pytest
++import warnings
+ 
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+     from dateutil.parser._parser import _timelex, _tzparser
+     from dateutil.parser._parser import _parsetz
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _tzparser()
+-        assert len(recorder) == 0
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _timelex('2014-03-03')
+ 
+-        assert len(recorder) == 0
+-
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _parsetz('+05:00')
+-        assert len(recorder) == 0
+ 
+ 
+ @pytest.mark.tzstr
diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template
new file mode 100644
index 00000000000..ace3398432f
--- /dev/null
+++ b/srcpkgs/python3-dateutil/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dateutil'
+pkgname=python3-dateutil
+version=2.8.2
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six tzdata"
+checkdepends="python3-pytest-cov python3-hypothesis python3-freezegun ${depends}"
+short_desc="Extensions to the standard Python3 datetime module"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/dateutil/dateutil"
+distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
+checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
+
+post_install() {
+	vlicense LICENSE
+}