diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index f60b5eea28d1..471190506679 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -1,24 +1,24 @@
 # Created by: Stas Timokhin <devel@stasyan.com>
 # $FreeBSD$
 
 PORTNAME=	harminv
 PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Solver of harmonic inversion
 
 USES=		blaslapack fortran gmake libtool pathfix
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 USE_LDCONFIG=	yes
 
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 
 .include <bsd.port.mk>
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 0c5576144eab..468f83528b7c 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -1,48 +1,45 @@
 # Created by: Stas Timokhin <devel@stasyan.com>
 # $FreeBSD$
 
 PORTNAME=	meep
-PORTVERSION=	1.2
-PORTREVISION=	12
+PORTVERSION=	1.2.1
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
-BROKEN=		Depends on conflicting guile and guile2 (via libctl)
-
 BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
 		libblas.so:${PORTSDIR}/math/blas \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 RUN_DEPENDS=	harminv:${PORTSDIR}/science/harminv
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USES=		fortran gettext gmake iconv libtool pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_DEFINE=		OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 OPENMPI_DESC=		MPI support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 CONFIGURE_ARGS+=--with-mpi
 CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
 CFLAGS+=	-I${LOCALBASE}/mpi/openmpi/include
 PLIST_SUB+=	MPI="" NOMPI="@comment "
 .else
 CONFIGURE_ARGS+=--without-mpi
 PLIST_SUB+=	MPI="@comment " NOMPI=""
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/meep/distinfo b/science/meep/distinfo
index 7370b36a4493..54fa578f3aa2 100644
--- a/science/meep/distinfo
+++ b/science/meep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meep-1.2.tar.gz) = 2734737b8053a45942bc1a50933d63b6fd18c7dc3cf33e92e0815ece93138942
-SIZE (meep-1.2.tar.gz) = 807522
+SHA256 (meep-1.2.1.tar.gz) = f1f0683e5688d231f7dd1863939677148fc27a6744c03510e030c85d6c518ea5
+SIZE (meep-1.2.1.tar.gz) = 731272