diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 8b5c40079d91..d60348746508 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -1,49 +1,53 @@
 PORTNAME=	mpb
 DISTVERSION=	1.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	MIT Photonic-Bands
 WWW=		https://mpb.readthedocs.io/en/latest/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:shells/bash
+# NLOPT should be enabled in science/libctl
 LIB_DEPENDS=	libctl.so:science/libctl \
 		libfftw3.so:math/fftw3 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libguile-2.2.so:lang/guile2 \
-		libhdf5.so:science/hdf5
+		libhdf5.so:science/hdf5 \
+		libnlopt.so:math/nlopt
 
 USES=		fortran libtool pkgconfig readline
-GNU_CONFIGURE=	yes
 USE_GCC=	yes
+USE_LDCONFIG=	yes
 # Do not use --with-mpi, because it is not guaranted
 # that science/hdf5 also built with option PARALLEL
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared
 
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		ATLAS NLOPT OPENMP
-OPTIONS_DEFAULT=	NLOPT
+OPTIONS_DEFINE=		ATLAS OPENMP
 
 ATLAS_DESC=	Use math/atlas instead of math/openblas
-NLOPT_DESC=	Use math/nlopt (enable also in science/libctl)
 OPENMP_DESC=	Use OpenMP (enable also in math/fftw3)
 
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 ATLAS_USES_OFF=		blaslapack:openblas
 ATLAS_CONFIGURE_ON=	--with-lapack=-lalapack
 ATLAS_CONFIGURE_OFF=	--with-blas=openblas --with-lapack=-lopenblas
-NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 OPENMP_CONFIGURE_ON=	--with-openmp
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && \
 	${COPYTREE_SHARE} "*.ctl *.scm" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/science/mpb/pkg-plist b/science/mpb/pkg-plist
index e878bec9ee8a..1eb019c61ec7 100644
--- a/science/mpb/pkg-plist
+++ b/science/mpb/pkg-plist
@@ -1,28 +1,31 @@
 bin/mpb
 bin/mpb-data
 bin/mpb-split
 include/mpb.h
 include/mpb/eigensolver.h
 include/mpb/matrices.h
 include/mpb/maxwell.h
 include/mpb/scalar.h
 include/mpb/verbosity.h
 lib/libmpb.a
+lib/libmpb.so
+lib/libmpb.so.1
+lib/libmpb.so.1.4.1
 man/man1/mpb-data.1.gz
 man/man1/mpb-split.1.gz
 man/man1/mpb.1.gz
 %%EXAMPLESDIR%%/bragg-sine.ctl
 %%EXAMPLESDIR%%/bragg.ctl
 %%EXAMPLESDIR%%/check.ctl
 %%EXAMPLESDIR%%/diamond.ctl
 %%EXAMPLESDIR%%/dos.scm
 %%EXAMPLESDIR%%/hole-slab.ctl
 %%EXAMPLESDIR%%/honey-rods.ctl
 %%EXAMPLESDIR%%/line-defect.ctl
 %%EXAMPLESDIR%%/sq-rods.ctl
 %%EXAMPLESDIR%%/strip.ctl
 %%EXAMPLESDIR%%/tri-holes.ctl
 %%EXAMPLESDIR%%/tri-rods.ctl
 %%EXAMPLESDIR%%/tutorial.ctl
 %%EXAMPLESDIR%%/wavevector.scm
 %%DATADIR%%/mpb.scm