diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index aa4e7340870e..4a0ce896b0e8 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -17,18 +17,23 @@ COMMENT=	Theora video codec for the Ogg multimedia streaming system
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
-USE_GCC=	3.4+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHEAD_LIBS}"
-CONFIGURE_ARGS=	--disable-sdltest \
+CONFIGURE_ARGS+=--disable-sdltest \
 		--enable-shared
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CONFIGURE_ARGS+=--disable-asm
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/examples/Makefile.in
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>