diff --git a/graphics/py-s2/Makefile b/graphics/py-s2/Makefile
index 339646283ff0..854e830cb985 100644
--- a/graphics/py-s2/Makefile
+++ b/graphics/py-s2/Makefile
@@ -1,35 +1,34 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	s2
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding of S2 Geometry Library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
 BUILD_DEPENDS=	s2>=${PORTVERSION}:graphics/s2 \
 		swig:devel/swig
 LIB_DEPENDS=	libs2.so:graphics/s2
 
-USES=		cmake localbase:ldflags python
+USES=		cmake compiler:c++11-lang localbase:ldflags python
 
 WRKSRC_SUBDIR=	src/python
 
 GH_ACCOUNT=	google
 GH_PROJECT=	s2geometry
 USE_GITHUB=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == powerpc64
-USES+=		compiler:gcc-c++11-lib
-.else
-USES+=		compiler:c++11-lang
+.if ${ARCH} == powerpc64 && !defined(CPUTYPE)
+CXXFLAGS+=	-mcpu=power7
 .endif
 
 .include <bsd.port.mk>