diff --git a/format-warning.patch b/format-warning.patch
deleted file mode 100644
index 5549b68..0000000
--- a/format-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/gnome2/dialog.c b/src/gnome2/dialog.c
-index d13df3f..ccf161d 100644
---- a/src/gnome2/dialog.c
-+++ b/src/gnome2/dialog.c
-@@ -656,18 +656,13 @@ void gui_generic_warning(char *message)
- {
- #if 1
- 	GtkWidget *dialog;
--	gchar *dialog_text;
--
--	dialog_text = g_strdup_printf
--	    ("<b><big>Xiphos</big></b>\n\n%s", message);	/* ξίφος */
- 
- 	dialog = gtk_message_dialog_new_with_markup
- 	    (NULL,	/* no need for a parent window */
- 	     GTK_DIALOG_DESTROY_WITH_PARENT,
- 	     GTK_MESSAGE_INFO,
- 	     GTK_BUTTONS_OK,
--	     dialog_text);
--	g_free(dialog_text);
-+	     "<b><big>Xiphos</big></b>\n\n%s", message);
- 
- 	g_signal_connect_swapped (dialog, "response",
- 				  G_CALLBACK (gtk_widget_destroy),
diff --git a/xiphos.spec b/xiphos.spec
index 7119749..c4f4424 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,6 +1,13 @@
+# Define whether or not we are building for GTK3
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+%define build3 0
+%else
+%define build3 1
+%endif
+
 Name:           xiphos
 Version:        4.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@@ -104,6 +111,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/xiphos/
 
 %changelog
+* Fri Mar 30 2018 Greg Hellings <greg.hellings@gmail.com> - 4.0.7-2
+- Force rebuild for Sword 1.8.x update
+
 * Mon Sep 25 2017 Greg Hellings <greg.hellings@gmail.com> - 4.0.7-1
 - Upstream release 4.0.7
 
@@ -141,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Moved appdata and desktop files to gtk2 build, allowing
   proper auto-discovery by gnome-software. BZ#1330096
 
+* Tue Mar 01 2016 Greg Hellings <greg.hellings@gmail.com> - 4.0.4-4
+- Rebuild against new SWORD library
+
 * Mon Feb 08 2016 Greg Hellings <greg.hellings@gmail.com> - 4.0.4-3
 - Exclude ppc64 from EPEL for lack of gtkhtml3
 
@@ -157,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
+* Tue Apr 21 2015 Matej Cepl <mcepl@redhat.com> - 4.0.2-2
+- Don’t build on ppc* on EPEL-7 ... we don't have gtkhtml3 there.
+
 * Wed Apr 15 2015 Greg Hellings <greg.hellings@gmail.com> 4.0.2-1
 - Version bump - major upstream memory bugs
 
@@ -303,7 +319,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Update to 2.3.6
 
 * Thu Jul 24 2008 Deji Akingunola <dakingun@gmail.com> - 2.3.5-2
-- Bump EVR 
+- Bump EVR
 
 * Thu Jul 03 2008 Deji Akingunola <dakingun@gmail.com> - 2.3.5-1
 - Update to 2.3.5
@@ -393,7 +409,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Fix Build requires
 
 * Wed Nov 08 2006 Deji Akingunola <dakingun@gmail.com> - 2.1.8-1
-- Update to new (unstable) version 
+- Update to new (unstable) version
 
 * Wed Sep 20 2006 Deji Akingunola <dakingun@gmail.com> - 2.1.6-4
 - Add perl(XML::Parser) to the BRs