diff --git a/net/swirc/Makefile b/net/swirc/Makefile
index 15dd223cbb1..3fc658b1894 100644
--- a/net/swirc/Makefile
+++ b/net/swirc/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2020/04/22 15:48:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2020/04/23 16:01:15 ajacoutot Exp $
 
 COMMENT =	curses icb and irc client
 DISTNAME =	swirc-3.2.4
 CATEGORIES =	net
 HOMEPAGE =	https://www.nifty-networks.net/swirc/
+REVISION =	0
 
 MAINTAINER =		Markus Uhlin <markus.uhlin@bredband.net>
 
diff --git a/net/swirc/patches/patch-configure b/net/swirc/patches/patch-configure
new file mode 100644
index 00000000000..944973e4615
--- /dev/null
+++ b/net/swirc/patches/patch-configure
@@ -0,0 +1,17 @@
+$OpenBSD: patch-configure,v 1.1 2020/04/23 16:01:15 ajacoutot Exp $
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -50,9 +50,9 @@ SHARED_FLAGS=-DBSD=1\\
+ 	-I/usr/local/include\\
+ 	-Wall
+ CC=cc
+-CFLAGS=\$(SHARED_FLAGS) -std=c99
++CFLAGS=\$(SHARED_FLAGS) -std=c99 ${CFLAGS}
+ CXX=c++
+-CXXFLAGS=\$(SHARED_FLAGS) -std=c++14
++CXXFLAGS=\$(SHARED_FLAGS) -std=c++14 ${CXXFLAGS}
+ LDFLAGS=-L/usr/local/lib
+ LDLIBS=-lcrypto\\
+ 	-lcurl\\
diff --git a/net/swirc/patches/patch-src_events_cap_c b/net/swirc/patches/patch-src_events_cap_c
new file mode 100644
index 00000000000..10b7e3b0150
--- /dev/null
+++ b/net/swirc/patches/patch-src_events_cap_c
@@ -0,0 +1,38 @@
+$OpenBSD: patch-src_events_cap_c,v 1.1 2020/04/23 16:01:15 ajacoutot Exp $
+
+Index: src/events/cap.c
+--- src/events/cap.c.orig
++++ src/events/cap.c
+@@ -89,7 +89,7 @@ shouldContinueCapabilityNegotiation_case1()
+     return (config_bool_unparse("away_notify", false) ||
+ 	    config_bool_unparse("invite_notify", false) ||
+ 	    config_bool_unparse("ircv3_server_time", false) ||
+-	    config_bool_unparse("sasl", false));
++	    sasl_is_enabled());
+ }
+ 
+ static bool
+@@ -97,20 +97,20 @@ shouldContinueCapabilityNegotiation_case2()
+ {
+     return (config_bool_unparse("invite_notify", false) ||
+ 	    config_bool_unparse("ircv3_server_time", false) ||
+-	    config_bool_unparse("sasl", false));
++	    sasl_is_enabled());
+ }
+ 
+ static bool
+ shouldContinueCapabilityNegotiation_case3()
+ {
+     return (config_bool_unparse("ircv3_server_time", false) ||
+-	    config_bool_unparse("sasl", false));
++	    sasl_is_enabled());
+ }
+ 
+ static bool
+ shouldContinueCapabilityNegotiation_case4()
+ {
+-    return (config_bool_unparse("sasl", false));
++    return (sasl_is_enabled());
+ }
+ 
+ /**