diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile
index 0e06f83bd96a..ca00a082a697 100644
--- a/math/py-mathics-scanner/Makefile
+++ b/math/py-mathics-scanner/Makefile
@@ -1,38 +1,41 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
-PORTNAME=	mathics-scanner
-PORTVERSION=	1.0.0
+PORTNAME=	Mathics_Scanner
+PORTVERSION=	1.1.2
 CATEGORIES=	math python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Tokeniser, char tables, & conversion routines for the Wolfram Language
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pyaml>0:textproc/py-pyaml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pyaml>0:textproc/py-pyaml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 TEST_DEPENDS=	gmake:devel/gmake	\
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Mathics3
+#USE_GITHUB=	yes
+#GH_ACCOUNT=	Mathics3
 
 USES=		python:3.6+ shebangfix
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils noflavors
 
 NO_ARCH=	yes
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
 PLIST_SUB+=	VER=${PORTVERSION}
 TEST_TARGET=	check
 TEST_ENV=	${MAKE_ENV}
 
 do-test: install
 	(cd ${TEST_WRKSRC} &&	\
 	${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET})
 
 .include <bsd.port.mk>
diff --git a/math/py-mathics-scanner/distinfo b/math/py-mathics-scanner/distinfo
index 0e379a187ab3..62e682e8679d 100644
--- a/math/py-mathics-scanner/distinfo
+++ b/math/py-mathics-scanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613330381
-SHA256 (Mathics3-mathics-scanner-1.0.0_GH0.tar.gz) = 2e6e98d130a00ed00f24b02fc25828e749ea448ea6d2970d768446c0e0ff32fe
-SIZE (Mathics3-mathics-scanner-1.0.0_GH0.tar.gz) = 79777
+TIMESTAMP = 1617904183
+SHA256 (Mathics_Scanner-1.1.2.tar.gz) = 54d300e00489d6fc6871d6f456eecbe125a92f859d99c17587b3921b1db976d9
+SIZE (Mathics_Scanner-1.1.2.tar.gz) = 78393
diff --git a/math/py-mathics-scanner/pkg-plist b/math/py-mathics-scanner/pkg-plist
index f882d8137551..76c4f246ecb7 100644
--- a/math/py-mathics-scanner/pkg-plist
+++ b/math/py-mathics-scanner/pkg-plist
@@ -1,35 +1,33 @@
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON_SITELIBDIR%%/Mathics_Scanner-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+bin/mathics-generate-json-table
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__init__.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/characters.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/feed.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/load.cpython-37.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/prescanner.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/tokeniser.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/characters.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/characters.json
 %%PYTHON_SITELIBDIR%%/mathics_scanner/data/element.csv
 %%PYTHON_SITELIBDIR%%/mathics_scanner/errors.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/feed.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/build_tables.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/__pycache__/rl_inputrc.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/build_tables.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/generate/rl_inputrc.py
+%%PYTHON_SITELIBDIR%%/mathics_scanner/load.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/prescanner.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/tokeniser.py
 %%PYTHON_SITELIBDIR%%/mathics_scanner/version.py