diff --git a/math/py-pysmt/Makefile b/math/py-pysmt/Makefile
index 44131fb240b..0ec66b40429 100644
--- a/math/py-pysmt/Makefile
+++ b/math/py-pysmt/Makefile
@@ -1,32 +1,26 @@
-COMMENT =		library for SMT formulae manipulation and solving
+COMMENT=	library for SMT formulae manipulation and solving
 
-MODPY_DISTV =	0.9.5
-DISTNAME =		PySMT-${MODPY_DISTV}
-PKGNAME =		py-${DISTNAME}
-REVISION =		3
+MODPY_DISTV=	0.9.6
+GH_ACCOUNT=	pysmt
+GH_PROJECT=	pysmt
+GH_TAGNAME=	v${MODPY_DISTV}
+PKGNAME=	py-PySMT-${MODPY_DISTV}
 
-CATEGORIES =		math
+CATEGORIES=	math
 
-HOMEPAGE =		http://www.pysmt.org
+HOMEPAGE=	https://github.com/pysmt/pysmt
 
 # Apache2
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
-
-MODPY_PI =		Yes
-MODPY_PYBUILD =	setuptools
+MODULES=	lang/python
+MODPY_PYBUILD=	setuptools
 
 # Explicitly not adding RUN_DEPENDS on all the supported
 # solvers. That would beat the point of this library.
 # Currently supported and ported is math/z3.
 
-# added for tests
-PORTHOME =		${WRKDIR}
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pysmt/
-	${INSTALL_DATA} ${WRKSRC}/README.rst \
-	    ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pysmt/
+# for tests
+PORTHOME=	${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/math/py-pysmt/distinfo b/math/py-pysmt/distinfo
index 61989f545e7..6ac398eebad 100644
--- a/math/py-pysmt/distinfo
+++ b/math/py-pysmt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PySMT-0.9.5.tar.gz) = DHlqbU5MiyWt6eyki5h2zjoUf04MC4UUaVEfVbmg7Ec=
-SIZE (PySMT-0.9.5.tar.gz) = 259220
+SHA256 (pysmt-0.9.6.tar.gz) = 1pVhq8zQicIzUqaGKzk5V01H037YKl19znUSdDfAYDI=
+SIZE (pysmt-0.9.6.tar.gz) = 1141496
diff --git a/math/py-pysmt/pkg/PLIST b/math/py-pysmt/pkg/PLIST
index 3f147c9edfc..83bbb7e7953 100644
--- a/math/py-pysmt/pkg/PLIST
+++ b/math/py-pysmt/pkg/PLIST
@@ -9,6 +9,7 @@ lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/licenses/
 lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/licenses/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/licenses/NOTICE
 lib/python${MODPY_VERSION}/site-packages/pysmt-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pysmt/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/__main__.py
@@ -81,8 +82,10 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}bd
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvcfive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvcfive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvcfour.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvcfour.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}pico.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -94,7 +97,8 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}z3
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/base.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/bdd.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/btor.py
-lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/cvc4.py
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/cvcfive.py
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/cvcfour.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/msat.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/pico.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/yices.py
@@ -156,8 +160,10 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}bdd.${MOD
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvcfive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvcfive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvcfour.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvcfour.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}eager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}eager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}interpolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -182,7 +188,8 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3.${MODP
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/bdd.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/btor.py
-lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/cvc4.py
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/cvcfive.py
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/cvcfour.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/eager.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/interpolation.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/msat.py
@@ -218,8 +225,8 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_configu
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_configuration.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc4_quantifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc4_quantifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc_quantifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc_quantifiers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_dwf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_dwf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_eager_model.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -282,6 +289,9 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walker_
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walker_ext.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walkers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walkers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/configs/
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/configs/config1.ini
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/configs/config_bad.ini
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/examples.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/__init__.py
@@ -353,7 +363,7 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_bv_simplification.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_cnf.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_configuration.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_constants.py
-lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_cvc4_quantifiers.py
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_cvc_quantifiers.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_dwf.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_eager_model.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/test_env.py
@@ -405,5 +415,5 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/dag.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/generic.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/identitydag.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/tree.py
-share/doc/${MODPY_PY_PREFIX}pysmt/
-share/doc/${MODPY_PY_PREFIX}pysmt/README.rst
+share/doc/py-pysmt/
+share/doc/py-pysmt/README.rst