diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 8c2410b39ffb..cf0c78faf9f3 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nlopt
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://ab-initio.mit.edu/nlopt/
 
@@ -14,13 +15,13 @@ LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libguile.so:${PORTSDIR}/lang/guile
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.8.1:${PORTSDIR}/math/py-numpy
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.8.1:${PORTSDIR}/math/py-numpy
+		libguile-2.0.so:${PORTSDIR}/lang/guile2
+BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30 \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy
 
 CONFIGURE_ARGS=	--enable-shared
-CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
+CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 
 USES=		autoreconf compiler:features libtool pathfix \
 		pkgconfig python:2
diff --git a/math/nlopt/pkg-plist b/math/nlopt/pkg-plist
index e88f52a5b210..277fffcd9b16 100644
--- a/math/nlopt/pkg-plist
+++ b/math/nlopt/pkg-plist
@@ -18,4 +18,4 @@ libdata/pkgconfig/nlopt.pc
 %%PYTHON_SITELIBDIR%%/nlopt.pyc
 %%PYTHON_SITELIBDIR%%/nlopt.pyo
 man/man3/nlopt.3.gz
-share/guile/site/nlopt.scm
+share/guile/site/2.0/nlopt.scm