diff --git a/.gitignore b/.gitignore
index 5e0a8ca..1747d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ bacula-docs-5.0.3.tar.bz2
 /bacula-9.0.4.tar.gz
 /bacula-9.0.5.tar.gz
 /bacula-9.0.6.tar.gz
+/bacula-9.0.7.tar.gz
diff --git a/bacula-9.0.6-qt5-support.patch b/bacula-9.0.6-qt5-support.patch
deleted file mode 100644
index 179918c..0000000
--- a/bacula-9.0.6-qt5-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp old/src/qt-console/pages.h new/src/qt-console/pages.h
---- old/src/qt-console/pages.h	2017-11-21 18:37:16.000000000 +0100
-+++ new/src/qt-console/pages.h	2018-02-06 12:37:04.490297821 +0100
-@@ -21,7 +21,7 @@
- /*
-  *   Dirk Bartley, March 2007
-  */
--
-+#include <QtGlobal>
- #if QT_VERSION >= 0x050000
- #include <QtWidgets>
- #else
diff --git a/bacula.spec b/bacula.spec
index 20a9065..c8afbc2 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:               bacula
-Version:            9.0.6
-Release:            8%{?dist}
+Version:            9.0.7
+Release:            1%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -46,7 +46,6 @@ Patch9:             %{name}-9.0.6-tray-monitor-task.patch
 # required by the daemons.
 # http://bugs.bacula.org/view.php?id=2084
 Patch10:            %{name}-7.0.4-autoconf.patch
-Patch11:            %{name}-9.0.6-qt5-support.patch
 
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators
@@ -64,11 +63,6 @@ BuildRequires:      lzo-devel
 BuildRequires:      ncurses-devel
 BuildRequires:      openssl-devel
 BuildRequires:      postgresql-devel
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
-BuildRequires:      qt5-devel
-%else
-BuildRequires:      qt4-devel >= 4.6.2
-%endif
 BuildRequires:      readline-devel
 BuildRequires:      sqlite-devel
 BuildRequires:      zlib-devel
@@ -80,16 +74,17 @@ BuildRequires:      perl-interpreter
 BuildRequires:      perl
 %endif
 
-
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:      systemd
 %endif
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 BuildRequires:      mariadb-connector-c-devel
+BuildRequires:      qt5-devel
 %else
 BuildRequires:      mysql-devel
 BuildRequires:      tcp_wrappers-devel
+BuildRequires:      qt4-devel >= 4.6.2
 %endif
 
 %description
@@ -329,7 +324,6 @@ Provides check_bacula support for Nagios.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -390,7 +384,7 @@ make %{?_smp_mflags}
 make -C examples/nagios/check_bacula
 
 pushd src/qt-console/tray-monitor
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
     %{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro
 %else
     %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
@@ -592,7 +586,7 @@ fi
 %{_libdir}/libbaccfg-%{version}.so
 %{_libdir}/libbacfind-%{version}.so
 %{_libdir}/libbacsd-%{version}.so
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 %{_libdir}/libbaccats-%{version}.so
 %endif
 
@@ -747,6 +741,9 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Mon May 14 2018 Simone Caronni <negativo17@gmail.com> - 9.0.7-1
+- Update to 9.0.7.
+
 * Wed Feb 07 2018 Josef Ridky <jridky@redhat.com> - 9.0.6-8
 - Return support of Qt4 for older releases
 
diff --git a/sources b/sources
index 1fb10bd..98741d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bacula-9.0.6.tar.gz) = a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
+SHA512 (bacula-9.0.7.tar.gz) = ef49830a9f94773f63e1168c95c8097ca5828e07a0af2c4155927129ce592ae9c5a71b8e0fab6f62882ca6ffc1418fc3a36b84c8425776026eb9b3769eeaecb7