diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index 5ac9fafd110d..12b8538551ae 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -2,33 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	pyx12
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
-MASTER_SITES=	SF
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	pyx12-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Validate and convert HIPAA X12 documents
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	BSD3CLAUSE
 
 USE_PYTHON=	yes
-USE_BZIP2=	yes
 USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
-
-MAN1=	x12valid.1 x12norm.1 x12xml.1 x12html.1 xmlx12.1
-MAN5=	pyx12.conf.xml.5
-SUB_FILES=	pkg-deinstall
-
-NO_STAGE=	yes
-post-install:
-	${PYTHON_CMD} ${WRKSRC}/bin/x12_build_pkl.py ${PREFIX}/share/pyx12/map/
-	cd ${WRKSRC}/bin && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
-	cd ${WRKSRC}/bin && ${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pyx12/distinfo b/textproc/py-pyx12/distinfo
index 61595e19217b..73160dd6f519 100644
--- a/textproc/py-pyx12/distinfo
+++ b/textproc/py-pyx12/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyx12-1.5.0.tar.bz2) = 09025318d717557b099a7c0305bb3e4e78ef8849902f11c56f1a1ab6e288dfce
-SIZE (pyx12-1.5.0.tar.bz2) = 190267
+SHA256 (pyx12-2.1.1.tar.gz) = 3bbd020f327e48938596a68f773c1a2324a84de2129e218008892ca1ba500d53
+SIZE (pyx12-2.1.1.tar.gz) = 499856
diff --git a/textproc/py-pyx12/pkg-plist b/textproc/py-pyx12/pkg-plist
deleted file mode 100644
index fb50d8e33d0c..000000000000
--- a/textproc/py-pyx12/pkg-plist
+++ /dev/null
@@ -1,255 +0,0 @@
-bin/x12_build_pkl
-bin/x12html
-bin/x12info
-bin/x12norm
-bin/x12sql
-bin/x12valid
-bin/x12xml
-bin/xmlx12
-%%PYTHON_SITELIBDIR%%/pyx12/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx12/codes.py
-%%PYTHON_SITELIBDIR%%/pyx12/dataele.py
-%%PYTHON_SITELIBDIR%%/pyx12/errh_xml.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_997.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_debug.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_handler.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_html.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_item.py
-%%PYTHON_SITELIBDIR%%/pyx12/error_visitor.py
-%%PYTHON_SITELIBDIR%%/pyx12/errors.py
-%%PYTHON_SITELIBDIR%%/pyx12/map_if.py
-%%PYTHON_SITELIBDIR%%/pyx12/map_index.py
-%%PYTHON_SITELIBDIR%%/pyx12/map_override.py
-%%PYTHON_SITELIBDIR%%/pyx12/map_walker.py
-%%PYTHON_SITELIBDIR%%/pyx12/params.py
-%%PYTHON_SITELIBDIR%%/pyx12/path.py
-%%PYTHON_SITELIBDIR%%/pyx12/segment.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12file.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12n_document.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtag.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtagqual.py
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_simple.py
-%%PYTHON_SITELIBDIR%%/pyx12/xmlwriter.py
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_idtag.py
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_simple.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/codes.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dataele.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dups.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_if.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_index.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_walker.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/params.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/path.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/segment.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/support.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/utils.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12xml_idtag.py
-%%PYTHON_SITELIBDIR%%/pyx12/tests/xmlwriter.py
-%%PYTHON_SITELIBDIR%%/pyx12/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/codes.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/dataele.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/errh_xml.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_997.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_debug.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_handler.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_html.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_item.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/error_visitor.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/errors.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/map_if.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/map_index.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/map_override.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/map_walker.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/params.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/path.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/segment.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12file.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12n_document.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtag.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtagqual.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_simple.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/xmlwriter.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_idtag.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_simple.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/codes.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dataele.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dups.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_if.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_index.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_walker.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/params.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/path.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/segment.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/support.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12xml_idtag.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/tests/xmlwriter.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/codes.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/dataele.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/errh_xml.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_997.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_debug.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_handler.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_html.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_item.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/error_visitor.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/errors.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/map_if.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/map_index.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/map_override.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/map_walker.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/params.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/path.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/segment.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12file.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12n_document.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtag.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtagqual.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/x12xml_simple.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/xmlwriter.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_idtag.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/xmlx12_simple.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/codes.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dataele.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/dups.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_if.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_index.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/map_walker.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/params.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/path.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/segment.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/support.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/x12xml_idtag.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/tests/xmlwriter.pyo
-etc/pyx12.conf.xml.sample
-%%DATADIR%%/pyx12.conf.xml.sample
-%%DATADIR%%/test/pyx12.conf.xml
-%%DATADIR%%/test/pyx12test.conf.xml
-%%DATADIR%%/test/test.py
-%%DATADIR%%/test/test_codes.py
-%%DATADIR%%/test/test_dataele.py
-%%DATADIR%%/test/test_functional.py
-%%DATADIR%%/test/test_map_if.py
-%%DATADIR%%/test/test_map_index.py
-%%DATADIR%%/test/test_map_walker.py
-%%DATADIR%%/test/test_params.py
-%%DATADIR%%/test/test_path.py
-%%DATADIR%%/test/test_segment.py
-%%DATADIR%%/test/test_syntax.py
-%%DATADIR%%/test/test_utils.py
-%%DATADIR%%/test/test_x12file.py
-%%DATADIR%%/test/test_x12xml_idtag.py
-%%DATADIR%%/test/test_xmlwriter.py
-%%DATADIR%%/test/files/820.loops.txt
-%%DATADIR%%/test/files/834_lui_id.997.base
-%%DATADIR%%/test/files/834_lui_id.txt
-%%DATADIR%%/test/files/835_test.xsl
-%%DATADIR%%/test/files/837_2000C_N.xsl
-%%DATADIR%%/test/files/bad_2010AA_bug.997.base
-%%DATADIR%%/test/files/bad_2010AA_bug.txt
-%%DATADIR%%/test/files/bad_elements.997.base
-%%DATADIR%%/test/files/bad_elements.txt
-%%DATADIR%%/test/files/bad_header_looping.997.base
-%%DATADIR%%/test/files/bad_header_looping.txt
-%%DATADIR%%/test/files/blank1.997.base
-%%DATADIR%%/test/files/blank1.txt
-%%DATADIR%%/test/files/ele.997.base
-%%DATADIR%%/test/files/ele.txt
-%%DATADIR%%/test/files/explicit_missing.997.base
-%%DATADIR%%/test/files/explicit_missing.txt
-%%DATADIR%%/test/files/fail_no_IEA.997.base
-%%DATADIR%%/test/files/fail_no_IEA.txt
-%%DATADIR%%/test/files/gs_id.txt
-%%DATADIR%%/test/files/loop_counting.997.base
-%%DATADIR%%/test/files/loop_counting.txt
-%%DATADIR%%/test/files/loop_counting2.997.base
-%%DATADIR%%/test/files/loop_counting2.txt
-%%DATADIR%%/test/files/loop_counting2.xsl
-%%DATADIR%%/test/files/mult_isa.997.base
-%%DATADIR%%/test/files/mult_isa.txt
-%%DATADIR%%/test/files/mult_trn.997.base
-%%DATADIR%%/test/files/mult_trn.txt
-%%DATADIR%%/test/files/ordinal.997.base
-%%DATADIR%%/test/files/ordinal.txt
-%%DATADIR%%/test/files/ordinal.xml.idtag
-%%DATADIR%%/test/files/ordinal.xml.idtagqual
-%%DATADIR%%/test/files/ordinal.xml.simple
-%%DATADIR%%/test/files/per_repeat.997.base
-%%DATADIR%%/test/files/per_repeat.txt
-%%DATADIR%%/test/files/repeat_init_seg.997.base
-%%DATADIR%%/test/files/repeat_init_seg.txt
-%%DATADIR%%/test/files/simple1.997.base
-%%DATADIR%%/test/files/simple1.txt
-%%DATADIR%%/test/files/trailer_errors.997.base
-%%DATADIR%%/test/files/trailer_errors.txt
-%%DATADIR%%/test/files/trailing_terms.997.base
-%%DATADIR%%/test/files/trailing_terms.txt
-%%DOCSDIR%%/CHANGELOG.txt
-%%DOCSDIR%%/INSTALL.txt
-%%DOCSDIR%%/LICENSE.txt
-%%DOCSDIR%%/README.txt
-%%DATADIR%%/map/270.4010.X092.A1.xml
-%%DATADIR%%/map/271.4010.X092.A1.xml
-%%DATADIR%%/map/276.4010.X093.A1.xml
-%%DATADIR%%/map/277.4010.X093.A1.xml
-%%DATADIR%%/map/277U.4010.X070.xml
-%%DATADIR%%/map/278.4010.X094.27.A1.xml
-%%DATADIR%%/map/278.4010.X094.A1.xml
-%%DATADIR%%/map/820.4010.X061.A1.xml
-%%DATADIR%%/map/830.4010.PS.xml
-%%DATADIR%%/map/834.4010.X095.A1.xml
-%%DATADIR%%/map/835.4010.X091.A1.xml
-%%DATADIR%%/map/837.4010.X096.A1.xml
-%%DATADIR%%/map/837.4010.X097.A1.xml
-%%DATADIR%%/map/837.4010.X098.A1.xml
-%%DATADIR%%/map/841.4010.XXXC.xml
-%%DATADIR%%/map/997.4010.xml
-%%DATADIR%%/map/codes.xml
-%%DATADIR%%/map/comp_test.xml
-%%DATADIR%%/map/dataele.xml
-%%DATADIR%%/map/maps.xml
-%%DATADIR%%/map/x12.control.00401.xml
-%%DATADIR%%/map/270.4010.X092.A1.pkl
-%%DATADIR%%/map/271.4010.X092.A1.pkl
-%%DATADIR%%/map/276.4010.X093.A1.pkl
-%%DATADIR%%/map/277.4010.X093.A1.pkl
-%%DATADIR%%/map/277U.4010.X070.pkl
-%%DATADIR%%/map/278.4010.X094.27.A1.pkl
-%%DATADIR%%/map/278.4010.X094.A1.pkl
-%%DATADIR%%/map/820.4010.X061.A1.pkl
-%%DATADIR%%/map/830.4010.PS.pkl
-%%DATADIR%%/map/834.4010.X095.A1.pkl
-%%DATADIR%%/map/835.4010.X091.A1.pkl
-%%DATADIR%%/map/837.4010.X096.A1.pkl
-%%DATADIR%%/map/837.4010.X097.A1.pkl
-%%DATADIR%%/map/837.4010.X098.A1.pkl
-%%DATADIR%%/map/841.4010.XXXC.pkl
-%%DATADIR%%/map/997.4010.pkl
-%%DATADIR%%/map/codes.pkl
-%%DATADIR%%/map/x12.control.00401.pkl
-%%DATADIR%%/map/README
-%%DATADIR%%/map/codes.xsd
-%%DATADIR%%/map/map.xsd
-%%DATADIR%%/map/dataele.xsd
-%%DATADIR%%/map/x12simple.dtd
-@dirrm %%DATADIR%%/map
-@dirrm %%DATADIR%%/test/files
-@dirrm %%DATADIR%%/test
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pyx12/tests
-@dirrm %%PYTHON_SITELIBDIR%%/pyx12