diff --git a/root-mysql-workaround.patch b/root-mysql-workaround.patch
new file mode 100644
index 0000000..be2ad62
--- /dev/null
+++ b/root-mysql-workaround.patch
@@ -0,0 +1,21 @@
+diff -ur root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx root-6.10.04/sql/mysql/src/TMySQLServer.cxx
+--- root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx	2017-07-28 15:15:40.000000000 +0200
++++ root-6.10.04/sql/mysql/src/TMySQLServer.cxx	2017-08-07 07:48:59.759498319 +0200
+@@ -41,6 +41,8 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
++#include <my_global.h>
++
+ #include "TMySQLServer.h"
+ #include "TMySQLResult.h"
+ #include "TMySQLStatement.h"
+@@ -52,8 +54,6 @@
+ #include "TObjString.h"
+ #include "TObjArray.h"
+ 
+-#include <my_global.h>
+-
+ 
+ ClassImp(TMySQLServer)
+ 
diff --git a/root-stressEntryList.patch b/root-stressEntryList.patch
deleted file mode 100644
index e1f36ae..0000000
--- a/root-stressEntryList.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 70eeecccca163cc9ae0a6d7f99baf8520552b27a Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 12 Jul 2017 17:33:16 +0200
-Subject: [PATCH] Make stressEntryList Test2() more robust against rounding
- errors
-
----
- test/stressEntryList.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
-index ee6303bb01..0d3a623af1 100644
---- a/test/stressEntryList.cxx
-+++ b/test/stressEntryList.cxx
-@@ -253,7 +253,7 @@ Bool_t Test2()
-    elistsum->Subtract(elist2);
-    n = elistsum->GetN();
-    TEntryList *elistcheck2 = new TEntryList("elistcheck2","elistcheck2");
--   chain->Draw(">>elistcheck2", "x>0 && (y>0.1 || y<-0.1)", "entrylist");
-+   chain->Draw(">>elistcheck2", cut1 && !cut2, "entrylist");
- 
-    wrongentries4 = 0;
-    for (Int_t i=0; i<n; i++){
-@@ -270,7 +270,7 @@ Bool_t Test2()
-    //subtract the first list
-    elistsum2->Subtract(elist1);
-    elistcheck2->Reset();
--   chain->Draw(">>elistcheck2", "x<0 && y<0.1 && y>-0.1", "entrylist");
-+   chain->Draw(">>elistcheck2", !cut1 && cut2, "entrylist");
-    wrongentries5 = 0;
-    n = elistcheck2->GetN();
-    for (Int_t i=0; i<n; i++){
--- 
-2.13.0
-
diff --git a/root.spec b/root.spec
index e28edcd..105dab4 100644
--- a/root.spec
+++ b/root.spec
@@ -23,9 +23,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.10.02
+Version:	6.10.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -59,9 +59,9 @@ Patch5:		%{name}-stressgraphics.patch
 #		Avoid build failures due to temporary file name clashes
 #		Backported from upstream git (master)
 Patch6:		%{name}-rootcling-tmpfile.patch
-#		Avoid test failures due to rounding errors
-#		Backported from upstream git (6.10 branch)
-Patch7:		%{name}-stressEntryList.patch
+#		Temporary workaround for broken mariadb headers in Fedora 27
+#		https://bugzilla.redhat.com/show_bug.cgi?id=1478739
+Patch7:		%{name}-mysql-workaround.patch
 
 #		s390 is not supported by cling: "error: unknown target
 #		triple 's390-ibm-linux', please use -triple or -arch"
@@ -1565,7 +1565,9 @@ ROOT as a Jupyter Notebook.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%if %{?fedora}%{!?fedora:0} >= 27
 %patch7 -p1
+%endif
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -1978,9 +1980,12 @@ rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 # Remove references to deleted (or moved) files from cmake files
 for target in mathtext minicern JupyROOT coreconttestUnit corebasetestUnit \
 	      testTProfile2Poly treetreeplayertestUnit testTBufferMerger ; do
-    sed -e "s/ ROOT::${target} / /" -e "/ROOT::${target}/d" \
+    sed -e "s/ ROOT::${target} / /" \
+	-e "/Create imported target ROOT::${target}/,/^$/d" \
+	-e "/set_target_properties(ROOT::${target}/,/^$/d" \
 	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
-    sed -e "/Import target \"ROOT::${target}\"/,/FILES_FOR_ROOT::${target}/d" \
+    sed -e "/Import target \"ROOT::${target}\"/,/^$/d" \
+	-e "/APPEND _IMPORT_CHECK_TARGETS ROOT::${target}/,/^$/d" \
 	-i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
 done
 sed -e 's/;ROOT::minicern//' \
@@ -3140,6 +3145,10 @@ fi
 %{_datadir}/%{name}/notebook
 
 %changelog
+* Sat Aug 05 2017 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.10.04-1
+- Update to 6.10.04
+- Add temporary workaround for broken mariadb headers in Fedora 27
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.02-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 9e9a1d4..fdc2b72 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.10.02.tar.xz) = c69fe783ab6cfa1f5ce632dfa8a1d7c2fa82fef5018363eb939a738384ce197f8cc8afba2d12fe396dd1f432f828bc98f8fb9d932a61d3df1176f344629a0d5f
+SHA512 (root-6.10.04.tar.xz) = 37f5462b22d0ce8aefaa7de375715f5ae1bf64b8b7bdb2110b1bb8f3b99744354014b1cb7bbf926cd046dd695f6c364504ea6512857da086dd963d449cbba5da
 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b