diff --git a/.gitignore b/.gitignore
index 69d5d51..9a93f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ offlineimap-6.1.2.tar.gz
 /make-docs-target-be-phony.patch
 /OfflineIMAP-offlineimap-v7.1.5.tar.gz
 /OfflineIMAP-offlineimap-v7.2.1.tar.gz
+/Handle-empty-token-with-complete-GSSAPI-context.patch
diff --git a/offlineimap.spec b/offlineimap.spec
index 27c6b3c..0696ca4 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -5,12 +5,13 @@
 
 Name:           offlineimap
 Version:        7.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
 URL:            https://github.com/OfflineIMAP/offlineimap/archive/v%{version}.tar.gz
 Source0:        %{packagedirprefix}-v%{version}.tar.gz
+Patch0:         Handle-empty-token-with-complete-GSSAPI-context.patch 
 
 BuildRequires:  python-unversioned-command
 BuildRequires:  python2-devel
@@ -39,6 +40,7 @@ not provide disconnected operation.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make build
@@ -75,6 +77,11 @@ install -p docs/offlineimapui.7.gz $RPM_BUILD_ROOT/%{_mandir}/man7/
 %{_mandir}/man7/offlineimapui.7*
 
 %changelog
+* Tue Dec 18 2018 Dodji Seketeli <dodji@redhat.com> - 7.2.1-2
+- Add patch to handle empty token with complete GSSAPI context.
+  This patch was committed upstream so it should be available in the
+  next upstream release.  It should fix rhbz#1646916.
+
 * Tue Dec  4 2018 Dodji Seketeli <dodji@redhat.com> - 7.2.1-1
 - Update to upstream 7.2.1 tarball
   - Drop the patch Port-to-python-gssapi-from-pykerberos.patch
diff --git a/sources b/sources
index 74b5fa8..61e4a7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OfflineIMAP-offlineimap-v7.2.1.tar.gz) = 4e6bcda576fbf023e0192e8d19627d72ea824cd795ef65604d56b00f239298031ea512dcc17d47ae340be1515770c8588907bc767489717a9ab136e34843c197
+SHA512 (Handle-empty-token-with-complete-GSSAPI-context.patch) = 94e162b0bc8d98cf5f08339cf64369a572e32ec1e403b126c31211aa079f7b63db4218635aee12c9ad4ac91841da642b7df3a00369d44da14c97082d2dde5d99