diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -520,8 +520,6 @@
 libgmodule-2.0.so.0:g_module_error
 libgmodule-2.0.so.0:g_module_open
 libgmodule-2.0.so.0:g_module_symbol
-libgobject-2.0.so.0:g_cclosure_marshal_VOID__POINTER
-libgobject-2.0.so.0:g_cclosure_marshal_VOID__VOID
 libgobject-2.0.so.0:g_object_get
 libgobject-2.0.so.0:g_object_get_data
 libgobject-2.0.so.0:g_object_new
@@ -560,6 +558,8 @@
 libgobject-2.0.so.0:g_value_set_uint
 libgobject-2.0.so.0:g_value_take_object
 libgobject-2.0.so.0:g_value_unset
+libgtk-x11-2.0.so.0:g_cclosure_marshal_VOID__POINTER
+libgtk-x11-2.0.so.0:g_cclosure_marshal_VOID__VOID
 libgtk-x11-2.0.so.0:gtk_about_dialog_get_type
 libgtk-x11-2.0.so.0:gtk_about_dialog_new
 libgtk-x11-2.0.so.0:gtk_about_dialog_set_comments
@@ -1105,6 +1105,7 @@
 libpango-1.0.so.0:pango_font_description_get_size
 libpango-1.0.so.0:pango_font_metrics_get_ascent
 libpango-1.0.so.0:pango_font_metrics_get_descent
+libpango-1.0.so.0:pango_font_metrics_get_height
 libpango-1.0.so.0:pango_font_metrics_unref
 libpango-1.0.so.0:pango_glyph_string_extents
 libpango-1.0.so.0:pango_layout_get_lines
diff --git a/files/0001-Default-to-Solus.patch b/files/0002-Default-to-Solus.patch
rename from files/0001-Default-to-Solus.patch
rename to files/0002-Default-to-Solus.patch
diff --git a/files/0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch b/files/0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch
new file mode 100644
--- /dev/null
+++ b/files/0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch
@@ -0,0 +1,44 @@
+commit 163608d7fd861c2c4911a38f45be484c88626bdc
+Author: John Levon <levon@movementarian.org>
+Date:   Mon Sep 7 17:53:31 2020 +0100
+
+    Use pango_font_metrics_get_height() to calculate font height (#2500)
+
+diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
+index fac0c4e6..418bb4da 100644
+--- a/src/fe-gtk/xtext.c
++++ b/src/fe-gtk/xtext.c
+@@ -283,8 +283,24 @@ backend_font_open (GtkXText *xtext, char *name)
+ 	metrics = pango_context_get_metrics (context, xtext->font->font, lang);
+ 	xtext->font->ascent = pango_font_metrics_get_ascent (metrics) / PANGO_SCALE;
+ 	xtext->font->descent = pango_font_metrics_get_descent (metrics) / PANGO_SCALE;
++
++	/*
++	 * In later versions of pango, a font's height should be calculated like
++	 * this to account for line gap; a typical symptom of not doing so is
++	 * cutting off the underscore on some fonts.
++	 */
++#if PANGO_VERSION_CHECK(1, 44, 0)
++	xtext->fontsize = pango_font_metrics_get_height (metrics) / PANGO_SCALE + 1;
++
++	if (xtext->fontsize == 0)
++		xtext->fontsize = xtext->font->ascent + xtext->font->descent;
++#else
++	xtext->fontsize = xtext->font->ascent + xtext->font->descent;
++#endif
++
+ 	pango_font_metrics_unref (metrics);
+ }
++
+ static int
+ backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis)
+ {
+@@ -3479,8 +3495,6 @@ gtk_xtext_set_font (GtkXText *xtext, char *name)
+ 	if (xtext->font == NULL)
+ 		return FALSE;
+ 
+-	xtext->fontsize = xtext->font->ascent + xtext->font->descent;
+-
+ 	{
+ 		char *time_str;
+ 		int stamp_size = xtext_get_stamp_str (time(0), &time_str);
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : hexchat
 version    : 2.14.3
-release    : 30
+release    : 31
 homepage   : https://hexchat.github.io/
 source     :
     - https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz : 901a9d13db5a4da69b827f6093306bbd16863dc49016f7668bd3e4506512e882
@@ -38,7 +38,8 @@
     - vala-panel-appmenu
 setup      : |
     %patch -p1 < $pkgfiles/0001-common-cfgfiles-Apply-Solus-defaults.patch
-    %patch -p1 < $pkgfiles/0001-Default-to-Solus.patch
+    %patch -p1 < $pkgfiles/0002-Default-to-Solus.patch
+    %patch -p1 < $pkgfiles/0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch
     %meson_configure -Dwith-theme-manager=true
 build      : |
     %ninja_build
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>hexchat</Name>
         <Homepage>https://hexchat.github.io/</Homepage>
         <Packager>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>reilly@reillybrogan.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>network.irc</PartOf>
@@ -92,7 +92,7 @@
         <Description xml:lang="en">HexChat is an IRC client based on XChat, but unlike XChat it’s completely free for both Windows and Unix-like systems.</Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="30">hexchat</Dependency>
+            <Dependency release="31">hexchat</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/hexchat-plugin.h</Path>
@@ -105,7 +105,7 @@
         <Description xml:lang="en">A theme manager for the hexchat IRC client</Description>
         <PartOf>network.irc</PartOf>
         <RuntimeDependencies>
-            <Dependency releaseFrom="30">hexchat</Dependency>
+            <Dependency releaseFrom="31">hexchat</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/thememan</Path>
@@ -115,12 +115,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="30">
+        <Update release="31">
             <Date>2021-05-01</Date>
             <Version>2.14.3</Version>
             <Comment>Packaging update</Comment>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>reilly@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file