diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 7f2b6edbb997..eeb959b8d964 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nlopt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	rhurlin@FreeBSD.org
@@ -15,15 +15,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_armv6=	fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory
 BROKEN_armv7=	fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory
 
-BUILD_DEPENDS=	swig:devel/swig \
-		${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
-
-USES=		cmake:testing compiler:features guile:2.2,alias,conflicts \
-		localbase pathfix pkgconfig python
-
+USES=		cmake:testing
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevengj
 USE_LDCONFIG=	yes
 
+FLAVORS=	full minimal
+
+.if ${FLAVOR:U} == minimal
+PKGNAMESUFFIX=	-${FLAVOR}
+CMAKE_OFF=	NLOPT_GUILE NLOPT_PYTHON NLOPT_SWIG
+CONFLICTS_INSTALL=	${PORTNAME}
+.else
+USES+=		guile:2.2,alias localbase pkgconfig python
+BUILD_DEPENDS=	swig:devel/swig ${PYNUMPY}
+RUN_DEPENDS=	${PYNUMPY}
+CONFLICTS_INSTALL=	${PORTNAME}-minimal
+PLIST_FILES=	lib/guile/2.2/extensions/nlopt_guile.so \
+		${PYTHON_SITELIBDIR}/_nlopt.so \
+		${PYTHON_SITELIBDIR}/nlopt.py \
+		${GUILE_SITE_DIR}/nlopt.scm
+.endif
+
 .include <bsd.port.mk>
diff --git a/math/nlopt/pkg-plist b/math/nlopt/pkg-plist
index cb367a91b99d..e54a29a5e4e9 100644
--- a/math/nlopt/pkg-plist
+++ b/math/nlopt/pkg-plist
@@ -5,14 +5,10 @@ lib/cmake/nlopt/NLoptConfig.cmake
 lib/cmake/nlopt/NLoptConfigVersion.cmake
 lib/cmake/nlopt/NLoptLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/nlopt/NLoptLibraryDepends.cmake
-lib/guile/2.2/extensions/nlopt_guile.so
 lib/libnlopt.so
 lib/libnlopt.so.0
 lib/libnlopt.so.0.11.1
-%%PYTHON_SITELIBDIR%%/_nlopt.so
-%%PYTHON_SITELIBDIR%%/nlopt.py
 libdata/pkgconfig/nlopt.pc
 share/man/man3/nlopt.3.gz
 share/man/man3/nlopt_minimize.3.gz
 share/man/man3/nlopt_minimize_constrained.3.gz
-share/guile/site/2.2/nlopt.scm