diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 1c113c8bacf..fd7b2c55a95 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2019/07/12 20:49:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2021/02/27 21:27:17 naddy Exp $
 
 COMMENT=	GTK+2 secure notes manager
 
 DISTNAME=	gringotts-1.2.10
-REVISION=	3
+REVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
@@ -14,8 +14,8 @@ PERMIT_PACKAGE=	Yes
 WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gringotts
-WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 popt pthread z
+WANTLIB += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 popt z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gringotts.berlios/}
 
diff --git a/security/gringotts/patches/patch-src_grg_attachs_h b/security/gringotts/patches/patch-src_grg_attachs_h
new file mode 100644
index 00000000000..d410f1d0c3e
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_attachs_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_grg_attachs_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_attachs.h
+--- src/grg_attachs.h.orig
++++ src/grg_attachs.h
+@@ -24,7 +24,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-gint current_attach_ID;
++extern gint current_attach_ID;
+ 
+ gint grg_attach_file (gchar * path, GtkWidget * parent);
+ void grg_remove_attachment (void);
diff --git a/security/gringotts/patches/patch-src_grg_entries_h b/security/gringotts/patches/patch-src_grg_entries_h
new file mode 100644
index 00000000000..15199902113
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_entries_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_grg_entries_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_entries.h
+--- src/grg_entries.h.orig
++++ src/grg_entries.h
+@@ -24,7 +24,7 @@
+ 
+ /* current element. */
+ /* MUST BE USED ONLY BY grg_attachs.h !!!! */
+-GList *current;
++extern GList *current;
+ 
+ /* Appends a new entry to the list */
+ void grg_entries_append (void);
diff --git a/security/gringotts/patches/patch-src_grg_menus_c b/security/gringotts/patches/patch-src_grg_menus_c
new file mode 100644
index 00000000000..db7fd4dd05d
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_menus_c
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_grg_menus_c,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_menus.c
+--- src/grg_menus.c.orig
++++ src/grg_menus.c
+@@ -31,6 +31,12 @@
+ 
+ #include <gdk/gdkkeysyms.h>
+ 
++GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++GtkWidget *bwipe;
++GtkWidget *babo;
++
+ #define NEW_MENU_ITEM(var, text, cb, data, parent, img, key, mod) \
+ 	var = gtk_image_menu_item_new_with_mnemonic(text); \
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (parent), var); \
diff --git a/security/gringotts/patches/patch-src_grg_menus_h b/security/gringotts/patches/patch-src_grg_menus_h
new file mode 100644
index 00000000000..be61967c836
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_menus_h
@@ -0,0 +1,30 @@
+$OpenBSD: patch-src_grg_menus_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_menus.h
+--- src/grg_menus.h.orig
++++ src/grg_menus.h
+@@ -25,19 +25,19 @@
+ #include <gtk/gtk.h>
+ 
+ /* menu File */
+-GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++extern GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
+ 
+ /* menu Edit */
+-GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++extern GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
+ 
+ /* menu Navigation */
+-GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++extern GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
+ 
+ /* menu Tools */
+-GtkWidget *bwipe;
++extern GtkWidget *bwipe;
+ 
+ /* menu Help */
+-GtkWidget *babo;
++extern GtkWidget *babo;
+ 
+ /*Makes a menubar, within a handlebox, and returns the GtkWidget */
+ GtkWidget *grg_menu_create (GtkWidget * window);
diff --git a/security/gringotts/patches/patch-src_grg_pix_h b/security/gringotts/patches/patch-src_grg_pix_h
new file mode 100644
index 00000000000..458d7f641f4
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_pix_h
@@ -0,0 +1,26 @@
+$OpenBSD: patch-src_grg_pix_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_pix.h
+--- src/grg_pix.h.orig
++++ src/grg_pix.h
+@@ -22,13 +22,13 @@
+ #ifndef GRG_PIX_H
+ #define GRG_PIX_H
+ 
+-const char *red_xpm[58];
+-const char *yellow_xpm[58];
+-const char *green_xpm[58];
+-const char *optimal_xpm[94];
++extern const char *red_xpm[58];
++extern const char *yellow_xpm[58];
++extern const char *green_xpm[58];
++extern const char *optimal_xpm[94];
+ 
+-const char *splash_xpm[180];
++extern const char *splash_xpm[180];
+ 
+-const char *wait_xpm[82];
+-const char *clip_xpm[17];
++extern const char *wait_xpm[82];
++extern const char *clip_xpm[17];
+ #endif
diff --git a/security/gringotts/patches/patch-src_grg_prefs_h b/security/gringotts/patches/patch-src_grg_prefs_h
new file mode 100644
index 00000000000..c2d331a3533
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_prefs_h
@@ -0,0 +1,30 @@
+$OpenBSD: patch-src_grg_prefs_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_prefs.h
+--- src/grg_prefs.h.orig
++++ src/grg_prefs.h
+@@ -24,15 +24,15 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-gboolean grg_prefs_warn4overwrite;
+-gboolean grg_prefs_bak_files;
+-gboolean grg_prefs_splash;
+-gboolean grg_prefs_tray;
+-gboolean grg_prefs_clip_clear_on_close;
+-gboolean grg_prefs_clip_clear_on_quit;
+-gint grg_prefs_xpire;
+-gint grg_prefs_wipe_passes;
+-gint grg_prefs_mainwin_width, grg_prefs_mainwin_height;
++extern gboolean grg_prefs_warn4overwrite;
++extern gboolean grg_prefs_bak_files;
++extern gboolean grg_prefs_splash;
++extern gboolean grg_prefs_tray;
++extern gboolean grg_prefs_clip_clear_on_close;
++extern gboolean grg_prefs_clip_clear_on_quit;
++extern gint grg_prefs_xpire;
++extern gint grg_prefs_wipe_passes;
++extern gint grg_prefs_mainwin_width, grg_prefs_mainwin_height;
+ 
+ gchar *get_pref_file (void);
+ void set_pref_file (const gchar * newval);
diff --git a/security/gringotts/patches/patch-src_grg_recent_dox_h b/security/gringotts/patches/patch-src_grg_recent_dox_h
new file mode 100644
index 00000000000..06cf7d2ec87
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_recent_dox_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_grg_recent_dox_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_recent_dox.h
+--- src/grg_recent_dox.h.orig
++++ src/grg_recent_dox.h
+@@ -24,7 +24,7 @@
+ 
+ #define GRG_RECENT_LIMIT 	6
+ 
+-GSList *grg_recent_dox;
++extern GSList *grg_recent_dox;
+ 
+ void grg_recent_dox_init (void);
+ void grg_recent_dox_deinit (void);
diff --git a/security/gringotts/patches/patch-src_grg_widgets_h b/security/gringotts/patches/patch-src_grg_widgets_h
new file mode 100644
index 00000000000..b3315a4af18
--- /dev/null
+++ b/security/gringotts/patches/patch-src_grg_widgets_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_grg_widgets_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/grg_widgets.h
+--- src/grg_widgets.h.orig
++++ src/grg_widgets.h
+@@ -25,7 +25,7 @@
+ #include "grg_defs.h"
+ #include <gtk/gtk.h>
+ 
+-gboolean mapIsUTF;
++extern gboolean mapIsUTF;
+ 
+ /* Shows and manages a dialog that asks for a string. */
+ gchar *grg_input_dialog (gchar * title, gchar * qtext, gchar * preset,
diff --git a/security/gringotts/patches/patch-src_gringotts_h b/security/gringotts/patches/patch-src_gringotts_h
new file mode 100644
index 00000000000..c04ceb69f33
--- /dev/null
+++ b/security/gringotts/patches/patch-src_gringotts_h
@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_gringotts_h,v 1.1 2021/02/27 21:27:17 naddy Exp $
+
+Index: src/gringotts.h
+--- src/gringotts.h.orig
++++ src/gringotts.h
+@@ -24,10 +24,10 @@
+ 
+ #include "grg_defs.h"
+ 
+-GList *garbage;
++extern GList *garbage;
+ 
+-GRG_CTX gctx;
+-glong pwdbirth;
++extern GRG_CTX gctx;
++extern glong pwdbirth;
+ 
+ 	/*callbacks for menu items */
+