diff --git a/net-im/cawbird/Makefile b/net-im/cawbird/Makefile
index 0c29f17974e7..4d415ec743f6 100644
--- a/net-im/cawbird/Makefile
+++ b/net-im/cawbird/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	cawbird
 PORTVERSION=	1.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fork of Corebird GTK Twitter client
 WWW=		https://github.com/IBBoard/cawbird
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		liboauth.so:net/liboauth \
 		librest-0.7.so:devel/librest \
 		libsoup-gnome-2.4.so:devel/libsoup
 
 USES=		gettext gnome meson pkgconfig sqlite:3 vala:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	IBBoard
 
 USE_GNOME=	glib20 gtk30
 
 GLIB_SCHEMAS=	uk.co.ibboard.cawbird.gschema.xml
 
 MESON_ARGS=	-Dconsumer_key_base64=YUVNOE14dE5xMVdHRzl2emo5SzNNSlNUeg== \
 	        -Dconsumer_secret_base64=c0J0cmc2clNJTFN6bHlSbFNXc2J1MmdvWWk3b0FzTGZHOGI4OG5QRzB3Tmx1Y0ZtOHQ=
 
 OPTIONS_DEFINE=	SPELLCHECK VIDEO
 
 SPELLCHECK_LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3
 SPELLCHECK_MESON_OFF=	-Dspellcheck=false
 
 VIDEO_USES=		gstreamer
 VIDEO_MESON_OFF=	-Dvideo=false
 
 .include <bsd.port.mk>
diff --git a/net-im/cawbird/files/patch-src_CbTweet.h b/net-im/cawbird/files/patch-src_CbTweet.h
new file mode 100644
index 000000000000..b1c9e6ade2de
--- /dev/null
+++ b/net-im/cawbird/files/patch-src_CbTweet.h
@@ -0,0 +1,14 @@
+libcawbird.a.p/src/list/TweetListEntry.c:1215:6: error: implicit declaration of function 'cb_tweet_has_quoted_inline_media' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+        if (cb_tweet_has_quoted_inline_media (tweet)) {
+            ^
+
+--- src/CbTweet.h.orig	2022-03-18 20:59:56 UTC
++++ src/CbTweet.h
+@@ -110,6 +110,7 @@ gboolean         cb_tweet_has_inline_media (CbTweet   
+ char **          cb_tweet_get_mentions     (CbTweet   *tweet,
+                                             int       *n_mentions);
+ gboolean         cb_tweet_has_inline_media (CbTweet   *tweet);
++gboolean         cb_tweet_has_quoted_inline_media (CbTweet *tweet);
+ gint64           cb_tweet_get_user_id      (CbTweet   *tweet);
+ const char *     cb_tweet_get_screen_name  (CbTweet   *tweet);
+ const char *     cb_tweet_get_user_name    (CbTweet   *tweet);
diff --git a/net-im/cawbird/files/patch-src_CbTweetModel.h b/net-im/cawbird/files/patch-src_CbTweetModel.h
new file mode 100644
index 000000000000..0b5b01aba460
--- /dev/null
+++ b/net-im/cawbird/files/patch-src_CbTweetModel.h
@@ -0,0 +1,14 @@
+libcawbird.a.p/src/TweetInfoPage.c:3374:20: error: implicit declaration of function 'cb_tweet_model_index_of_retweet' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+                replied_to_idx = cb_tweet_model_index_of_retweet (_tmp3_, reply_id);
+                                 ^
+
+--- src/CbTweetModel.h.orig	2022-03-18 20:59:56 UTC
++++ src/CbTweetModel.h
+@@ -56,6 +56,7 @@ int cb_tweet_model_index_of (CbTweetModel *self, gint6
+ CbTweetModel *cb_tweet_model_new (void);
+ 
+ int cb_tweet_model_index_of (CbTweetModel *self, gint64 id);
++int cb_tweet_model_index_of_retweet (CbTweetModel *self, gint64 id);
+ 
+ gboolean cb_tweet_model_contains_id  (CbTweetModel *self,
+                                       gint64        id);