diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 9e541b02b8d8..6128e41d6a0f 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -2,24 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	dateutil
-PORTVERSION=	2.1
-PORTREVISION=	3
+PORTVERSION=	2.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-dateutil-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Provides powerful extensions to the standard datetime module
+COMMENT=	Extensions to the standard Python datetime module
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	autoplist distutils
 
 # Fix incorrect permissions
 post-patch:
@@ -27,6 +26,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|import winreg|from six.moves import winreg|' ${WRKSRC}/dateutil/tzwin.py
 
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} test.py
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/devel/py-dateutil/distinfo b/devel/py-dateutil/distinfo
index 6eabbe233f3a..beacadb5fb0b 100644
--- a/devel/py-dateutil/distinfo
+++ b/devel/py-dateutil/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-dateutil-2.1.tar.gz) = 4c44ec3f9ff057b8c7b4c78beca5fdd8710600ea9a1df42f31bfcbae2f059dee
-SIZE (python-dateutil-2.1.tar.gz) = 152334
+SHA256 (python-dateutil-2.2.tar.gz) = eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468
+SIZE (python-dateutil-2.2.tar.gz) = 259085
diff --git a/devel/py-dateutil/files/patch-dateutil____init__.py b/devel/py-dateutil/files/patch-dateutil____init__.py
deleted file mode 100644
index cba102788722..000000000000
--- a/devel/py-dateutil/files/patch-dateutil____init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./dateutil/__init__.py.orig	2012-03-28 18:25:44.000000000 +0400
-+++ ./dateutil/__init__.py	2013-01-23 14:12:35.000000000 +0400
-@@ -5,6 +5,6 @@
- This module offers extensions to the standard Python
- datetime module.
- """
--__author__ = "Tomi Pieviläinen <tomi.pievilainen@iki.fi>"
-+__author__ = "Tomi Pievilainen <tomi.pievilainen@iki.fi>"
- __license__ = "Simplified BSD"
- __version__ = "2.1"
diff --git a/devel/py-dateutil/files/patch-setup.py b/devel/py-dateutil/files/patch-setup.py
new file mode 100644
index 000000000000..a8cc194523f0
--- /dev/null
+++ b/devel/py-dateutil/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- ./setup.py.orig	2014-08-28 18:39:38.459159039 +1000
++++ ./setup.py	2014-08-28 18:39:48.929863352 +1000
+@@ -47,5 +47,6 @@
+           'Programming Language :: Python :: 3.2',
+           'Programming Language :: Python :: 3.3',
+           'Topic :: Software Development :: Libraries',
+-      ]
++      ],
++      test_suite='test',
+       )