diff --git a/gnome-contacts-disambiguate_Gtk.HeaderBar.patch b/gnome-contacts-disambiguate_Gtk.HeaderBar.patch
new file mode 100644
index 0000000..834cc82
--- /dev/null
+++ b/gnome-contacts-disambiguate_Gtk.HeaderBar.patch
@@ -0,0 +1,30 @@
+From c5eee38cd2556403a640a0a4c11d36cbf9a5a798 Mon Sep 17 00:00:00 2001
+From: Niels De Graef <nielsdegraef@gmail.com>
+Date: Thu, 30 May 2019 14:30:54 +0200
+Subject: [PATCH] window: Disambiguate Gtk.HeaderBar
+
+Apparently libhandy also added a HeaderBar type, which means this
+clashes with that of Gtk.
+---
+ src/contacts-window.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/contacts-window.vala b/src/contacts-window.vala
+index 738228d..49f6995 100644
+--- a/src/contacts-window.vala
++++ b/src/contacts-window.vala
+@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+   [GtkChild]
+   private TitleBar titlebar;
+   [GtkChild]
+-  private HeaderBar left_header;
++  private Gtk.HeaderBar left_header;
+   [GtkChild]
+-  private HeaderBar right_header;
++  private Gtk.HeaderBar right_header;
+   [GtkChild]
+   private Overlay notification_overlay;
+   [GtkChild]
+-- 
+2.21.0
+
diff --git a/gnome-contacts.changes b/gnome-contacts.changes
index b8bbb88..8da7c9c 100644
--- a/gnome-contacts.changes
+++ b/gnome-contacts.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun 15 19:27:35 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add gnome-contacts-disambiguate_Gtk.HeaderBar.patch: window:
+  Disambiguate Gtk.HeaderBar, fix build with new libhandy.
+
 -------------------------------------------------------------------
 Wed Apr 24 16:50:36 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-contacts.spec b/gnome-contacts.spec
index 25c71fd..09366f4 100644
--- a/gnome-contacts.spec
+++ b/gnome-contacts.spec
@@ -24,6 +24,8 @@ License:        GPL-2.0-or-later
 Group:          Productivity/Office/Other
 URL:            https://wiki.gnome.org/Apps/Contacts
 Source0:        https://download.gnome.org/sources/gnome-contacts/3.32/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-contacts-disambiguate_Gtk.HeaderBar.patch -- window: Disambiguate Gtk.HeaderBar
+Patch0:         gnome-contacts-disambiguate_Gtk.HeaderBar.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook_4