diff --git a/security/xca/Makefile b/security/xca/Makefile
index 079b2101744..a36693c8b4d 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2019/06/03 16:06:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2020/01/30 23:19:33 sthen Exp $
 
 COMMENT=	create and manage certificates, CSRs, keys, etc
 
-V=		2.1.2
+V=		2.2.1
 DISTNAME=	xca-$V
 PORTROACH=	skipv:RELEASE.$V
 CATEGORIES=	security x11
-REVISION=	0
 
 HOMEPAGE=	https://hohnstaedt.de/xca/
 
@@ -15,7 +14,8 @@ MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 # BSD
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Sql Qt5Widgets c crypto ltdl m
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Sql Qt5Widgets
+WANTLIB += c crypto ltdl m
 
 MASTER_SITES=	https://github.com/chris2511/xca/releases/download/RELEASE.$V/
 
@@ -24,7 +24,6 @@ MODULES=	x11/qt5
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE= gnu
-# yuk, but it does the trick.
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -std=c++11" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/security/xca/distinfo b/security/xca/distinfo
index b37a657c3b7..bf64b2d7d9a 100644
--- a/security/xca/distinfo
+++ b/security/xca/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xca-2.1.2.tar.gz) = /IRUcKArC0U0tGWQvjB/eEZiBx/EEv3K1gXDvOkB/gU=
-SIZE (xca-2.1.2.tar.gz) = 1086563
+SHA256 (xca-2.2.1.tar.gz) = gpQQceNbxTShMFYxU0FDW04xImB3wxjEkcD4jaQ733g=
+SIZE (xca-2.2.1.tar.gz) = 1339412
diff --git a/security/xca/patches/patch-Makefile b/security/xca/patches/patch-Makefile
index 8d3a01b86ef..242877f0ded 100644
--- a/security/xca/patches/patch-Makefile
+++ b/security/xca/patches/patch-Makefile
@@ -1,8 +1,9 @@
-$OpenBSD: patch-Makefile,v 1.6 2018/09/14 16:02:37 sthen Exp $
+$OpenBSD: patch-Makefile,v 1.7 2020/01/30 23:19:33 sthen Exp $
+
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -122,9 +122,7 @@ snapshot:
+@@ -128,9 +128,7 @@ snapshot:
  		gzip -9 > xca-$${HASH}.tar.gz
  
  install: xca$(SUFFIX) $(INSTTARGET)
@@ -11,5 +12,5 @@ Index: Makefile
 -	$(STRIP) $(destdir)$(bindir)/xca
 +	$(BSD_INSTALL_PROGRAM) xca $(destdir)$(bindir)
  
- xca-8859-1.nsi: misc/xca.nsi
- 	iconv -f utf8 -t iso-8859-15 -o "$@" "$<"
+ xca$(SUFFIX).signed: xca$(SUFFIX)
+ 
diff --git a/security/xca/patches/patch-configure b/security/xca/patches/patch-configure
new file mode 100644
index 00000000000..5d00f25dd0b
--- /dev/null
+++ b/security/xca/patches/patch-configure
@@ -0,0 +1,14 @@
+$OpenBSD: patch-configure,v 1.6 2020/01/30 23:19:33 sthen Exp $
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -4103,7 +4103,7 @@ fi
+ # Finally collect the compiler flags
+ #####################################
+ CXXFLAGS="${CXXFLAGS} ${OPENSSL_CFLAGS} ${QT_CFLAGS}"
+-LIBS="${LIBS} ${OPENSSL_LIBS} ${QT_LIBS} -lstdc++"
++LIBS="${LIBS} ${OPENSSL_LIBS} ${QT_LIBS}"
+ 
+ # Just give it a try .....
+ ##########################
diff --git a/security/xca/patches/patch-doc_Makefile b/security/xca/patches/patch-doc_Makefile
index 7f5e255f4ca..0f93f023f7f 100644
--- a/security/xca/patches/patch-doc_Makefile
+++ b/security/xca/patches/patch-doc_Makefile
@@ -1,4 +1,5 @@
-$OpenBSD: patch-doc_Makefile,v 1.5 2018/02/21 11:48:35 sthen Exp $
+$OpenBSD: patch-doc_Makefile,v 1.6 2020/01/30 23:19:33 sthen Exp $
+
 Index: doc/Makefile
 --- doc/Makefile.orig
 +++ doc/Makefile
diff --git a/security/xca/patches/patch-lib_ipvalidator_h b/security/xca/patches/patch-lib_ipvalidator_h
new file mode 100644
index 00000000000..445b4b0eeb1
--- /dev/null
+++ b/security/xca/patches/patch-lib_ipvalidator_h
@@ -0,0 +1,15 @@
+$OpenBSD: patch-lib_ipvalidator_h,v 1.1 2020/01/30 23:19:33 sthen Exp $
+
+Index: lib/ipvalidator.h
+--- lib/ipvalidator.h.orig
++++ lib/ipvalidator.h
+@@ -24,7 +24,9 @@
+  *   So we reduce the validation on windows to the RegEx
+  */
+ #if !defined(Q_OS_WIN32)
++#include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ unsigned char buf[sizeof(struct in6_addr)];
+ #else
+ #define inet_pton(a,b,c) (1)
diff --git a/security/xca/patches/patch-misc_Makefile b/security/xca/patches/patch-misc_Makefile
index 92dda240032..f14374fedbd 100644
--- a/security/xca/patches/patch-misc_Makefile
+++ b/security/xca/patches/patch-misc_Makefile
@@ -1,4 +1,5 @@
-$OpenBSD: patch-misc_Makefile,v 1.4 2018/09/10 21:03:42 sthen Exp $
+$OpenBSD: patch-misc_Makefile,v 1.5 2020/01/30 23:19:33 sthen Exp $
+
 Index: misc/Makefile
 --- misc/Makefile.orig
 +++ misc/Makefile
diff --git a/security/xca/pkg/PLIST b/security/xca/pkg/PLIST
index f64c195a427..fdb84e1d9b6 100644
--- a/security/xca/pkg/PLIST
+++ b/security/xca/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2019/01/31 20:11:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.10 2020/01/30 23:19:33 sthen Exp $
 @ask-update xca-<2 .xdb format changes in XCA 2.x. Upgrade is automatic, but backup your old files.
 @bin bin/xca
 @man man/man1/xca.1
@@ -25,8 +25,8 @@ share/pixmaps/
 share/pixmaps/xca-32x32.xpm
 share/xca/
 share/xca/CA.xca
-share/xca/HTTPS_client.xca
-share/xca/HTTPS_server.xca
+share/xca/TLS_client.xca
+share/xca/TLS_server.xca
 share/xca/dn.txt
 share/xca/eku.txt
 share/xca/oids.txt
@@ -34,10 +34,14 @@ share/xca/xca_de.qm
 share/xca/xca_es.qm
 share/xca/xca_fr.qm
 share/xca/xca_hr.qm
+share/xca/xca_it.qm
+share/xca/xca_ja.qm
+share/xca/xca_nl.qm
 share/xca/xca_pl.qm
 share/xca/xca_pt_BR.qm
 share/xca/xca_ru.qm
 share/xca/xca_sk.qm
 share/xca/xca_tr.qm
+share/xca/xca_zh_CN.qm
 @tag update-desktop-database
 @tag update-mime-database