diff --git a/bacula-9.4.1-g++-options.patch b/bacula-9.4.1-g++-options.patch
deleted file mode 100644
index a65cda0..0000000
--- a/bacula-9.4.1-g++-options.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur bacula-9.4.1.old/autoconf/configure.in bacula-9.4.1/autoconf/configure.in
---- bacula-9.4.1.old/autoconf/configure.in	2019-01-13 11:43:36.011952506 +0100
-+++ bacula-9.4.1/autoconf/configure.in	2019-01-13 11:44:42.663167694 +0100
-@@ -2986,11 +2986,6 @@
- AC_DEFINE(FDLIBS)
- 
- CFLAGS=${CFLAGS--O}
--
--if test x$have_gcc = xyes ; then
--   CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
--   CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
--fi
- LDFLAGS=${LDFLAGS--O}
- CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS"
diff --git a/bacula-9.4.1-s3-configure.patch b/bacula-9.4.1-s3-configure.patch
index 0c173e9..0bbfef9 100644
--- a/bacula-9.4.1-s3-configure.patch
+++ b/bacula-9.4.1-s3-configure.patch
@@ -1,7 +1,7 @@
-diff -Naur bacula-9.4.1.old/autoconf/configure.in bacula-9.4.1/autoconf/configure.in
---- bacula-9.4.1.old/autoconf/configure.in	2019-01-13 11:45:34.176106888 +0100
-+++ bacula-9.4.1/autoconf/configure.in	2019-01-13 11:46:13.992832830 +0100
-@@ -1887,6 +1887,20 @@
+diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
+--- bacula-9.4.2.old/autoconf/configure.in	2019-04-18 11:50:32.221553081 +0200
++++ bacula-9.4.2/autoconf/configure.in	2019-04-18 11:51:49.346938638 +0200
+@@ -1894,6 +1894,20 @@
  
  AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
  
@@ -22,7 +22,7 @@ diff -Naur bacula-9.4.1.old/autoconf/configure.in bacula-9.4.1/autoconf/configur
  S3_INC=
  S3_LIBS=
  S3_LDFLAGS=
-@@ -3624,6 +3638,7 @@
+@@ -3631,6 +3645,7 @@
     Encryption support:	     ${support_crypto}
     ZLIB support:	     ${have_zlib}
     LZO support: 	     ${have_lzo}
diff --git a/bacula-9.4.2-g++-options.patch b/bacula-9.4.2-g++-options.patch
new file mode 100644
index 0000000..194623c
--- /dev/null
+++ b/bacula-9.4.2-g++-options.patch
@@ -0,0 +1,15 @@
+diff -Naur bacula-9.4.2.old/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
+--- bacula-9.4.2.old/autoconf/configure.in	2019-04-18 11:49:06.099005902 +0200
++++ bacula-9.4.2/autoconf/configure.in	2019-04-18 11:49:27.545391181 +0200
+@@ -2993,11 +2993,6 @@
+ AC_DEFINE(FDLIBS)
+ 
+ CFLAGS=${CFLAGS--O}
+-
+-if test x$have_gcc = xyes ; then
+-   CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
+-   CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
+-fi
+ LDFLAGS=${LDFLAGS--O}
+ CPPFLAGS="$CPPFLAGS"
+ CFLAGS="$CFLAGS"
diff --git a/bacula.spec b/bacula.spec
index 5d72876..532b387 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:               bacula
-Version:            9.4.1
-Release:            6%{?dist}
+Version:            9.4.2
+Release:            1%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -37,7 +37,7 @@ Patch6:             %{name}-5.2.13-logwatch.patch
 Patch7:             %{name}-9.4.0-non-free-code.patch
 # desktop-file-install not supported on RHEL 6
 Patch8:             %{name}-9.0.2-desktop.patch
-Patch9:             %{name}-9.4.1-g++-options.patch
+Patch9:             %{name}-9.4.2-g++-options.patch
 # https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/
 Patch10:            %{name}-9.4.1-s3-configure.patch
 
@@ -334,8 +334,8 @@ autoconf -I autoconf/ -o configure autoconf/configure.in
 find updatedb -type f | xargs chmod -x
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
-export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
+export CFLAGS="%{optflags} -I%{_includedir}/ncurses"
+export CPPFLAGS="%{optflags} -I%{_includedir}/ncurses"
 %if 0%{?fedora} || 0%{?rhel} >= 7
 export PATH="$PATH:%{_qt5_bindir}"
 %else
@@ -749,6 +749,9 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Thu Apr 18 2019 Simone Caronni <negativo17@gmail.com> - 9.4.2-1
+- Update to 9.4.2.
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 9.4.1-6
 - Rebuild for readline 8.0