diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index a580e1106889..d53e488ce253 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -24,7 +24,8 @@ LICENSE_PERMS_COMMERCIAL=	dist-mirror dist-sell pkg-mirror pkg-sell no-auto-acce
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		zip compiler:c++0x
+USES=		zip
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 EXTRACT_BEFORE_ARGS=	-j -L -q
@@ -41,22 +42,18 @@ BUILDCMD=	linux
 BUILDCMD=	linux64
 .endif
 
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
 post-patch:
 # C{C,XX} safeness
 # CFLAGS safeness
-.if ${ARCH} == "i386"
 	@${REINPLACE_CMD} -E \
 		-e 's|gcc|${CC}|' \
 		-e 's|g\+\+|${CXX}|' \
 		-e 's|-O2|${CFLAGS}|' \
 		${WRKSRC}/${BUILDCMD}
-.else
-	@${REINPLACE_CMD} -E \
-		-e 's|gcc|${CC}|' \
-		-e 's|g\+\+|${CXX}|' \
-		-e 's|-O2|${CFLAGS} -fPIC|' \
-		${WRKSRC}/${BUILDCMD}
-.endif
 # Don't error when files not found
 # Fix mrmuldv.cc not existing due to s/gcc/CC/ replacement above.
 	@${REINPLACE_CMD} -E \