diff --git a/science/yoda/Makefile b/science/yoda/Makefile
index 8a342de70523..e7f13f33dbc5 100644
--- a/science/yoda/Makefile
+++ b/science/yoda/Makefile
@@ -1,37 +1,36 @@
 PORTNAME=	yoda
-DISTVERSION=	1.9.0
+DISTVERSION=	1.9.1
 CATEGORIES=	science
 MASTER_SITES=	https://yoda.hepforge.org/downloads/
 DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Particle physics package with classes for data analysis, histogramming
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang gmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	PYTHON
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		PYTHON
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
 
 PYTHON_USES=			python shebangfix
 PYTHON_USE=			PYTHON=cython
 PYTHON_CONFIGURE_ENABLE=	pyext
 PYTHON_MAKE_ENV=		PYTHON_VERSION=${PYTHON_VER} PYTHON=${PYTHON_CMD}
 PYTHON_VARS=			SHEBANG_FILES="bin/${PORTNAME}* bin/aida2yoda bin/aida2flat bin/flat2yoda"
-PYTHON_BROKEN=			Fails with "Error: 'lib/python2.7/site-packages/yoda/plotting.pyc' is referring to /usr/ports/science/yoda/work/stage"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libYODA.so
 
 post-install-PYTHON-on:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
-	@${MV} ${STAGEDIR}${PREFIX}/share/${PORTNAME:tu}/yoda-completion ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
 
 post-install-PYTHON-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/${PORTNAME:tu}
 
 .include <bsd.port.mk>
diff --git a/science/yoda/distinfo b/science/yoda/distinfo
index 2721cafcf453..720d7e83433d 100644
--- a/science/yoda/distinfo
+++ b/science/yoda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617748335
-SHA256 (YODA-1.9.0.tar.gz) = 335d5751650c94e71cd6e4a8c678c4ef092f9783da9f16baf361594628dfa28f
-SIZE (YODA-1.9.0.tar.gz) = 1436933
+TIMESTAMP = 1631464947
+SHA256 (YODA-1.9.1.tar.gz) = bf562d3895d9e1f40aa6128396480d3c20c8f7dcadba9f1a8259005f156f42cd
+SIZE (YODA-1.9.1.tar.gz) = 1453767
diff --git a/science/yoda/pkg-plist b/science/yoda/pkg-plist
index 6a70d8efe46b..18e67ed132b5 100644
--- a/science/yoda/pkg-plist
+++ b/science/yoda/pkg-plist
@@ -1,67 +1,96 @@
+%%PYTHON%%bin/aida2flat
+%%PYTHON%%bin/aida2yoda
+%%PYTHON%%bin/flat2yoda
 bin/yoda-config
+%%PYTHON%%bin/yoda2aida
+%%PYTHON%%bin/yoda2flat
+%%PYTHON%%bin/yoda2yoda
+%%PYTHON%%bin/yodacmp
+%%PYTHON%%bin/yodacnv
+%%PYTHON%%bin/yodadiff
+%%PYTHON%%bin/yodahist
+%%PYTHON%%bin/yodals
+%%PYTHON%%bin/yodamerge
+%%PYTHON%%bin/yodaplot
+%%PYTHON%%bin/yodascale
+%%PYTHON%%bin/yodastack
 etc/bash_completion.d/yoda-completion
 include/YODA/AnalysisObject.h
 include/YODA/Axis1D.h
 include/YODA/Axis2D.h
 include/YODA/Bin.h
 include/YODA/Bin1D.h
 include/YODA/Bin2D.h
 include/YODA/Binned.h
 include/YODA/Config/BuildConfig.h
 include/YODA/Config/YodaConfig.h
 include/YODA/Counter.h
 include/YODA/Dbn0D.h
 include/YODA/Dbn1D.h
 include/YODA/Dbn2D.h
 include/YODA/Dbn3D.h
 include/YODA/ErrorND.h
 include/YODA/Exceptions.h
 include/YODA/Fillable.h
 include/YODA/Histo1D.h
 include/YODA/Histo2D.h
 include/YODA/HistoBin1D.h
 include/YODA/HistoBin2D.h
 include/YODA/IO.h
 include/YODA/Index.h
 include/YODA/Point.h
 include/YODA/Point1D.h
 include/YODA/Point2D.h
 include/YODA/Point3D.h
 include/YODA/PointND.h
 include/YODA/Profile1D.h
 include/YODA/Profile2D.h
 include/YODA/ProfileBin1D.h
 include/YODA/ProfileBin2D.h
 include/YODA/ROOTCnv.h
 include/YODA/Reader.h
 include/YODA/ReaderAIDA.h
 include/YODA/ReaderFLAT.h
 include/YODA/ReaderMethods.icc
 include/YODA/ReaderYODA.h
 include/YODA/Scatter.h
 include/YODA/Scatter1D.h
 include/YODA/Scatter2D.h
 include/YODA/Scatter3D.h
 include/YODA/ScatterND.h
 include/YODA/Utils/BinSearcher.h
 include/YODA/Utils/Formatting.h
 include/YODA/Utils/MathUtils.h
 include/YODA/Utils/Predicates.h
 include/YODA/Utils/StringUtils.h
 include/YODA/Utils/Traits.h
 include/YODA/Utils/cachedvector.h
 include/YODA/Utils/fastlog.h
 include/YODA/Utils/getline.h
 include/YODA/Utils/indexedset.h
 include/YODA/Utils/ndarray.h
 include/YODA/Utils/sortedvector.h
 include/YODA/Weights.h
 include/YODA/Writer.h
 include/YODA/WriterAIDA.h
 include/YODA/WriterFLAT.h
 include/YODA/WriterMethods.icc
 include/YODA/WriterYODA.h
 include/YODA/YODA.h
 lib/libYODA.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda-1.9.1-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/plotting%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/root%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/script_helpers%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/__pycache__/search%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/core%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/plotting.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/root.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/script_helpers.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/search.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda/util%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda1/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/yoda1/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 libdata/pkgconfig/yoda.pc
-%%PYTHON%%share/bash-completion/completions/yoda-completion