diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index f89103e3b97d..22d58909aa63 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -1,37 +1,34 @@
 PORTNAME=	bijiben
 PORTVERSION=	40.1
 PORTREVISION=	7
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+=	01ccae2ccb64.patch:-p1 # https://gitlab.gnome.org/GNOME/bijiben/-/merge_requests/158
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Note editor designed to remain simple to use
 WWW=		https://wiki.gnome.org/Apps/Bijiben
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libtinysparql-3.0.so:devel/tinysparql \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libical.so:devel/libical \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libhandy-1.so:x11-toolkits/libhandy
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib desktop-file-utils gettext gnome \
 		localbase meson pkgconfig python:build \
 		shared-mime-info shebangfix tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo evolutiondataserver3 intltool
 SHEBANG_FILES=	${WRKSRC}/build-aux/meson_post_install.py
 
 GLIB_SCHEMAS=	org.gnome.Notes.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/deskutils/bijiben/files/patch-data_appdata_meson.build b/deskutils/bijiben/files/patch-data_appdata_meson.build
new file mode 100644
index 000000000000..292d44176224
--- /dev/null
+++ b/deskutils/bijiben/files/patch-data_appdata_meson.build
@@ -0,0 +1,10 @@
+--- data/appdata/meson.build.orig	2021-04-30 11:59:10 UTC
++++ data/appdata/meson.build
+@@ -1,7 +1,6 @@ i18n.merge_file(
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
diff --git a/deskutils/bijiben/files/patch-data_meson.build b/deskutils/bijiben/files/patch-data_meson.build
new file mode 100644
index 000000000000..bcc1d993de51
--- /dev/null
+++ b/deskutils/bijiben/files/patch-data_meson.build
@@ -0,0 +1,18 @@
+--- data/meson.build.orig	2021-04-30 11:59:10 UTC
++++ data/meson.build
+@@ -4,7 +4,6 @@ i18n.merge_file(
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),