diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index e58f6dbb1fa6..206e2868e491 100644
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@@ -21,8 +21,6 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 CONFLICTS_INSTALL=	guile-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
-BROKEN_powerpc64=	does not build: error: expected declaration specifiers or ... before __builtin_choose_expr
-BROKEN_sparc64=		fails to compile: errors in complex.h
 
 USES=		charsetfix gmake libtool makeinfo ncurses pathfix pkgconfig \
 		readline
@@ -32,13 +30,17 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+INFO=		guile r5rs
+
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	NLS THREADS
 OPTIONS_DEFAULT=THREADS
 OPTIONS_SUB=	yes
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
+
 THREADS_CONFIGURE_WITH=	threads
 THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
@@ -47,8 +49,6 @@ REINPLACE_FILES=	libguile/smob.c libguile/filesys.c libguile/gc.c \
 			libguile/mallocs.c libguile/eval.c \
 			libguile/gc-malloc.c libguile/ports.c
 
-INFO=		guile r5rs
-
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
diff --git a/lang/guile2/files/patch-libguile_numbers.c b/lang/guile2/files/patch-libguile_numbers.c
index ea13cc1c21c3..ebf0a522ff1b 100644
--- a/lang/guile2/files/patch-libguile_numbers.c
+++ b/lang/guile2/files/patch-libguile_numbers.c
@@ -1,6 +1,18 @@
---- libguile/numbers.c.orig	2014-03-12 13:24:54 UTC
+--- libguile/numbers.c.orig	2016-12-15 00:03:33 UTC
 +++ libguile/numbers.c
-@@ -183,7 +183,7 @@ static double atanh (double x) { return 
+@@ -45,7 +45,11 @@
+ #  include <config.h>
+ #endif
+ 
++/* With old GCC, do not override _Static_assert: it conflicts with
++   #include <complex.h> below. */
++#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
+ #include <verify.h>
++#endif
+ #include <assert.h>
+ 
+ #include <math.h>
+@@ -183,7 +187,7 @@ static double atanh (double x) { return 0.5 * log ((1 
  
  
  #if defined (GUILE_I)