diff --git a/mail/mailparser/Makefile b/mail/mailparser/Makefile
index 60122298bf4..c4e817f56eb 100644
--- a/mail/mailparser/Makefile
+++ b/mail/mailparser/Makefile
@@ -1,20 +1,20 @@
-COMMENT =		wrapper for 'email' in Python's standard library
+COMMENT=	wrapper for 'email' in Python's standard library
 
-MODPY_DISTV =	3.15.0
-DISTNAME =		mail-parser-${MODPY_DISTV}
-PKGNAME =		mailparser-${MODPY_DISTV}
-REVISION =		1
+MODPY_DISTV=	4.1.4
+DISTNAME=	mail_parser-${MODPY_DISTV}
+PKGNAME=	mailparser-${MODPY_DISTV}
 
-CATEGORIES =		mail
+CATEGORIES=	mail
+
+HOMEPAGE=	https://github.com/SpamScope/mail-parser
 
 # Apache 2.0
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
-MODPY_PYBUILD =		setuptools
-MODPY_PI =		Yes
+MODULES=	lang/python
+MODPY_PYBUILD=	setuptools
+MODPY_PI=	Yes
 
-RUN_DEPENDS =		devel/py-simplejson \
-			devel/py-six
+RUN_DEPENDS=	devel/py-six
 
 .include <bsd.port.mk>
diff --git a/mail/mailparser/distinfo b/mail/mailparser/distinfo
index 40b7742447a..0feeef96d82 100644
--- a/mail/mailparser/distinfo
+++ b/mail/mailparser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mail-parser-3.15.0.tar.gz) = 1mY4rPBjPf2KcY4eNkam1Y+OnXUIDJRjjHsme0sNbIY=
-SIZE (mail-parser-3.15.0.tar.gz) = 18001
+SHA256 (mail_parser-4.1.4.tar.gz) = tlq6077uP/t1x4Ubw3NBLGnhoiVh1J3XFC7n+0Mh7YI=
+SIZE (mail_parser-4.1.4.tar.gz) = 27193
diff --git a/mail/mailparser/pkg/PLIST b/mail/mailparser/pkg/PLIST
index ab404582f2c..4efaab5bbe6 100644
--- a/mail/mailparser/pkg/PLIST
+++ b/mail/mailparser/pkg/PLIST
@@ -1,9 +1,12 @@
-bin/mailparser
+bin/mail-parser
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/METADATA
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/RECORD
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/licenses/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/licenses/NOTICE.txt
 lib/python${MODPY_VERSION}/site-packages/mail_parser-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/mailparser/
 lib/python${MODPY_VERSION}/site-packages/mailparser/__init__.py
@@ -15,16 +18,16 @@ lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}__main__.${M
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}mailparser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}mailparser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mailparser/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mailparser/const.py
+lib/python${MODPY_VERSION}/site-packages/mailparser/core.py
 lib/python${MODPY_VERSION}/site-packages/mailparser/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/mailparser/mailparser.py
 lib/python${MODPY_VERSION}/site-packages/mailparser/utils.py
 lib/python${MODPY_VERSION}/site-packages/mailparser/version.py