diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index de5c80a71970..d3148375c2ea 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	FIAT
+PYDISTUTILS_AUTOPLIST=	yes
 
 MMVERSION=	1.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/math/py-fiat/pkg-plist b/math/py-fiat/pkg-plist
deleted file mode 100644
index 58b2af5bfc65..000000000000
--- a/math/py-fiat/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-%%PYTHON_SITELIBDIR%%/FIAT/P0.py
-%%PYTHON_SITELIBDIR%%/FIAT/P0.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/P0.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/__init__.py
-%%PYTHON_SITELIBDIR%%/FIAT/__init__.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/__init__.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/argyris.py
-%%PYTHON_SITELIBDIR%%/FIAT/argyris.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/argyris.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk2d.py
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk2d.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk2d.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk3d.py
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk3d.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/asci2vtk3d.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_fortin_marini.py
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_fortin_marini.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_fortin_marini.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_marini.py
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_marini.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/brezzi_douglas_marini.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/crouzeix_raviart.py
-%%PYTHON_SITELIBDIR%%/FIAT/crouzeix_raviart.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/crouzeix_raviart.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/discontinuous_lagrange.py
-%%PYTHON_SITELIBDIR%%/FIAT/discontinuous_lagrange.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/discontinuous_lagrange.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/dual_set.py
-%%PYTHON_SITELIBDIR%%/FIAT/dual_set.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/dual_set.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/expansions.py
-%%PYTHON_SITELIBDIR%%/FIAT/expansions.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/expansions.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/factorial.py
-%%PYTHON_SITELIBDIR%%/FIAT/factorial.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/factorial.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/finite_element.py
-%%PYTHON_SITELIBDIR%%/FIAT/finite_element.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/finite_element.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/functional.py
-%%PYTHON_SITELIBDIR%%/FIAT/functional.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/functional.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/hermite.py
-%%PYTHON_SITELIBDIR%%/FIAT/hermite.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/hermite.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/jacobi.py
-%%PYTHON_SITELIBDIR%%/FIAT/jacobi.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/jacobi.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/lagrange.py
-%%PYTHON_SITELIBDIR%%/FIAT/lagrange.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/lagrange.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/makelags.py
-%%PYTHON_SITELIBDIR%%/FIAT/makelags.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/makelags.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/morley.py
-%%PYTHON_SITELIBDIR%%/FIAT/morley.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/morley.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec.py
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec_second_kind.py
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec_second_kind.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/nedelec_second_kind.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/newdubiner.py
-%%PYTHON_SITELIBDIR%%/FIAT/newdubiner.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/newdubiner.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/polynomial_set.py
-%%PYTHON_SITELIBDIR%%/FIAT/polynomial_set.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/polynomial_set.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/quadrature.py
-%%PYTHON_SITELIBDIR%%/FIAT/quadrature.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/quadrature.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/raviart_thomas.py
-%%PYTHON_SITELIBDIR%%/FIAT/raviart_thomas.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/raviart_thomas.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/reference_element.py
-%%PYTHON_SITELIBDIR%%/FIAT/reference_element.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/reference_element.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/tabarg.py
-%%PYTHON_SITELIBDIR%%/FIAT/tabarg.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/tabarg.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/tablag.py
-%%PYTHON_SITELIBDIR%%/FIAT/tablag.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/tablag.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/transform_hermite.py
-%%PYTHON_SITELIBDIR%%/FIAT/transform_hermite.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/transform_hermite.pyo
-%%PYTHON_SITELIBDIR%%/FIAT/transform_morley.py
-%%PYTHON_SITELIBDIR%%/FIAT/transform_morley.pyc
-%%PYTHON_SITELIBDIR%%/FIAT/transform_morley.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/FIAT