diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index 1c953a48c012..872cea3353b1 100644
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	2.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 #MASTER_SITES=	${MASTER_SITE_GNU}
@@ -21,13 +21,13 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 
 CONFLICTS_INSTALL=	guile-[0-9]*
 
-USE_AUTOTOOLS=	aclocal automake libltdl
-USES=		gmake ncurses pkgconfig readline
-GNU_CONFIGURE=	yes
+USES=		charsetfix gmake libtool ncurses pathfix pkgconfig readline
+USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-USE_GCC=	any
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
@@ -51,16 +51,10 @@ INFO=		guile r5rs
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
-	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
-	      ${WRKSRC}/meta/Makefile.in ${WRKSRC}/meta/Makefile.am
-	@${REINPLACE_CMD} -e 's|libdir}/pkgconfig|prefix}/libdata/pkgconfig|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' ${WRKSRC}/configure.ac \
+	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|install-exec-local: install-exec-localcharset|install-exec-local:|g' \
-	       	${WRKSRC}/lib/Makefile.am
 .if ${PORT_OPTIONS:MTHREADS}
-	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/guile2/pkg-plist b/lang/guile2/pkg-plist
index cea9fb34f323..c0546b5cca7f 100644
--- a/lang/guile2/pkg-plist
+++ b/lang/guile2/pkg-plist
@@ -125,14 +125,14 @@ include/guile/%%GUILE_VER%%/libguile/vm.h
 include/guile/%%GUILE_VER%%/libguile/vports.h
 include/guile/%%GUILE_VER%%/libguile/weaks.h
 lib/libguile-%%GUILE_VER%%.a
-lib/libguile-%%GUILE_VER%%.la
 lib/libguile-%%GUILE_VER%%.so
-lib/libguile-%%GUILE_VER%%.so.29
-lib/libguile-%%GUILE_VER%%.so.29-gdb.scm
+lib/libguile-%%GUILE_VER%%.so.22
+lib/libguile-%%GUILE_VER%%.so.22.7.2
+lib/libguile-%%GUILE_VER%%.so.22.7.2-gdb.scm
 lib/libguilereadline-v-18.a
-lib/libguilereadline-v-18.la
 lib/libguilereadline-v-18.so
 lib/libguilereadline-v-18.so.18
+lib/libguilereadline-v-18.so.18.0.0
 lib/guile/%%GUILE_VER%%/ccache/rnrs.go
 lib/guile/%%GUILE_VER%%/ccache/statprof.go
 lib/guile/%%GUILE_VER%%/ccache/texinfo.go
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 22b7d3502c71..f166fbd63cd3 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mu
 PORTVERSION=	0.9.9.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	GH