diff --git a/vietnamese/x-unikey/Makefile b/vietnamese/x-unikey/Makefile
index 1dbcca0d1acf..52edf4a775cc 100644
--- a/vietnamese/x-unikey/Makefile
+++ b/vietnamese/x-unikey/Makefile
@@ -9,10 +9,13 @@ MASTER_SITES=	SF/unikey/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vietnamese input method for X
 
-USES=		tar:bzip2
+USES=		compiler tar:bzip2
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
+
 PLIST_FILES=	bin/unikey bin/ukxim
 
 .include <bsd.port.mk>
diff --git a/vietnamese/x-unikey/files/patch-src_xim_install.sh b/vietnamese/x-unikey/files/patch-src_xim_install.sh
new file mode 100644
index 000000000000..b8a635fcbefb
--- /dev/null
+++ b/vietnamese/x-unikey/files/patch-src_xim_install.sh
@@ -0,0 +1,10 @@
+Do not ask an interactive question during the install phase.
+
+--- src/xim/install.sh.orig	2018-08-25 14:18:57 UTC
++++ src/xim/install.sh
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0
+ echo 
+ echo "To use UniKey, certain environment variables must be set."
+ echo "Do you want to set these variables in /etc/profile? (y/N)"