diff --git a/devel/xeus/Makefile b/devel/xeus/Makefile
index e7a1e2aebc41..c7153d2a6e2d 100644
--- a/devel/xeus/Makefile
+++ b/devel/xeus/Makefile
@@ -1,26 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	xeus
 DISTVERSION=	0.19.2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ implementation of the Jupyter kernel protocol
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cppzmq>0:net/cppzmq \
 		nlohmann-json>0:devel/nlohmann-json \
 		xtl-quant-stack>0:devel/xtl-quant-stack
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libzmq.so:net/libzmq4
 
 USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	QuantStack
 CMAKE_OFF=	BUILD_STATIC_LIBS
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/xeus/files/extra-patch-CMakeLists.txt b/devel/xeus/files/extra-patch-CMakeLists.txt
new file mode 100644
index 000000000000..5f180e7038fb
--- /dev/null
+++ b/devel/xeus/files/extra-patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2019-05-24 14:55:26 UTC
++++ CMakeLists.txt
+@@ -212,12 +212,6 @@ macro(xeus_create_target target_name lin
+ 
+         target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder)
+ 
+-        if (DISABLE_ARCH_NATIVE)
+-            target_compile_options(${target_name} PUBLIC -mtune=generic)
+-        else ()
+-            target_compile_options(${target_name} PUBLIC -march=native)
+-        endif ()
+-
+         # Enable link time optimization and set the default symbol
+         # visibility to hidden (very important to obtain small binaries)
+         if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)